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

annotate libinterp/parse-tree/pt-stmt.cc @ 29457:313b8b897733

revamp handling of breakpoint line positions Use set<int> instead of map<int,int> since we don't assign number IDs to breakpoints, we just use line numbers. Allow breakpoint functions to accept individual line number arguments. Simplify iteration over sets of breakpoint lines. * debug.cc (bp_lines_to_ov): Rename from intmap_to_ov. * bp-table.h, bp-table.cc (bp_table::bp_lines): New typedef to replace bp_table::intmap. Change all uses. (bp_table::add_breakpoint, bp_table::remove_breakpoint): New overloads that accept single lines as integers instead of requiring a set of lines.

author	John W. Eaton <jwe@octave.org>
date	Wed, 03 Mar 2021 23:57:31 -0500
parents	0a5b15007766
children	a61e1a0f6024

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	3 // Copyright (C) 1996-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # include "config.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	28 #endif
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	29
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	30 #include <typeinfo>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	31
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	32 #include "quit.h"
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	33
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	34 #include "bp-table.h"
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	35 #include "comment-list.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	36 #include "event-manager.h"
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	37 #include "input.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	38 #include "oct-lvalue.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	39 #include "ov.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	40 #include "pager.h"
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	41 #include "pt-bp.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	42 #include "pt-cmd.h"
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	43 #include "pt-eval.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	44 #include "pt-id.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	45 #include "pt-idx.h"
2985 aa9d0c0e0458 [project @ 1997-05-16 06:54:18 by jwe] jwe parents: 2982 diff changeset	46 #include "pt-jump.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	47 #include "pt-pr-code.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	48 #include "pt-stmt.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	49 #include "utils.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	50 #include "variables.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	51
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	52 namespace octave
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	53 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	54 // A list of commands to be executed.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	55
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	56 tree_statement::~tree_statement (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	57 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	58 delete m_command;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	59 delete m_expression;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	60 delete m_comment_list;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	61 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	62
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	63 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	64 tree_statement::set_print_flag (bool print_flag)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	65 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 if (m_expression)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	67 m_expression->set_print_flag (print_flag);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	68 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	69
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	70 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	71 tree_statement::print_result (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	72 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 return m_expression && m_expression->print_result ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	74 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	75
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	76 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	77 tree_statement::set_breakpoint (const std::string& condition)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	78 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	79 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	80 m_command->set_breakpoint (condition);
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	81 else if (m_expression)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	82 m_expression->set_breakpoint (condition);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	83 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	84
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	85 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	86 tree_statement::delete_breakpoint (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	87 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	88 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	89 m_command->delete_breakpoint ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	90 else if (m_expression)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	91 m_expression->delete_breakpoint ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	92 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	93
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	94 bool
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	95 tree_statement::is_breakpoint (void) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	96 {
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	97 return m_command ? m_command->is_breakpoint ()
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	98 : (m_expression ? m_expression->is_breakpoint () : false);
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	99 }
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	100
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	101 bool
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	102 tree_statement::is_active_breakpoint (tree_evaluator& tw) const
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	103 {
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	104 return m_command ? m_command->is_active_breakpoint (tw)
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	105 : (m_expression ? m_expression->is_active_breakpoint (tw) : false);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	106 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	107
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	108 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	109 tree_statement::bp_cond () const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	110 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	111 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	112 ? m_command->bp_cond ()
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	113 : (m_expression ? m_expression->bp_cond () : "0"));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	114 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	115
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	116 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	117 tree_statement::line (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	118 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	120 ? m_command->line ()
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	121 : (m_expression ? m_expression->line () : -1));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	122 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	123
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	124 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	125 tree_statement::column (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	126 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	128 ? m_command->column ()
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 : (m_expression ? m_expression->column () : -1));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	130 }
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	131
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	132 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	133 tree_statement::set_location (int l, int c)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	134 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	135 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 m_command->set_location (l, c);
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	137 else if (m_expression)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	138 m_expression->set_location (l, c);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	139 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	140
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	141 void
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23656 diff changeset	142 tree_statement::echo_code (const std::string& prefix)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	143 {
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23656 diff changeset	144 tree_print_code tpc (octave_stdout, prefix);
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	145
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	146 accept (tpc);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	147 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	148
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	149 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	150 tree_statement::is_end_of_fcn_or_script (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	151 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	152 bool retval = false;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	153
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	154 if (m_command)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	155 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	156 tree_no_op_command *no_op_cmd
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	157 = dynamic_cast<tree_no_op_command *> (m_command);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	158
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	159 if (no_op_cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	160 retval = no_op_cmd->is_end_of_fcn_or_script ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	161 }
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	162
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	163 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	164 }
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	165
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	166 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	167 tree_statement::is_end_of_file (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	168 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	169 bool retval = false;
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	170
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	171 if (m_command)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	172 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	173 tree_no_op_command *no_op_cmd
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174 = dynamic_cast<tree_no_op_command *> (m_command);
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	175
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	176 if (no_op_cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	177 retval = no_op_cmd->is_end_of_file ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	178 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	179
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	180 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	181 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	182
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	183 // Create a "breakpoint" tree-walker, and get it to "walk" this
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	184 // statement list
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	185 // (FIXME: What does that do???)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	186
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	187 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	188 tree_statement_list::set_breakpoint (int line, const std::string& condition)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	189 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	190 tree_breakpoint tbp (line, tree_breakpoint::set, condition);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	191 accept (tbp);
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	192
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	193 return tbp.get_line ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	194 }
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	195
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	196 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	197 tree_statement_list::delete_breakpoint (int line)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	198 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	199 if (line < 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	200 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	201 octave_value_list bp_lst = list_breakpoints ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	202
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	203 int len = bp_lst.length ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	204
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	205 for (int i = 0; i < len; i++)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	206 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	207 tree_breakpoint tbp (i, tree_breakpoint::clear);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	208 accept (tbp);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	209 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	210 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	211 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	212 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	213 tree_breakpoint tbp (line, tree_breakpoint::clear);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	214 accept (tbp);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	215 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	216 }
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	217
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	218 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	219 tree_statement_list::list_breakpoints (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	220 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	221 tree_breakpoint tbp (0, tree_breakpoint::list);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	222 accept (tbp);
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	223
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	224 return tbp.get_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	225 }
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	226
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	227 // Get list of pairs (breakpoint line, breakpoint condition)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	228 std::list<bp_type>
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	229 tree_statement_list::breakpoints_and_conds (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	230 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	231 tree_breakpoint tbp (0, tree_breakpoint::list);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	232 accept (tbp);
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	233
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	234 std::list<bp_type> retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	235 octave_value_list lines = tbp.get_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	236 octave_value_list conds = tbp.get_cond_list ();
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	237
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	238 for (int i = 0; i < lines.length (); i++)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	239 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	240 retval.push_back (bp_type (lines(i).double_value (),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	241 conds(i).string_value ()));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	242 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	243
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	244 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	245 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	246
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	247 // Add breakpoints to file at multiple lines (the second arguments
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	248 // of line), to stop only if condition is true.
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	249 // Updates GUI via event_manager::update_breakpoint.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	250 // FIXME: COME BACK TO ME.
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	251
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	252 bp_table::bp_lines
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	253 tree_statement_list::add_breakpoint (event_manager& evmgr,
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	254 const std::string& file,
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	255 const bp_table::bp_lines& lines,
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	256 const std::string& condition)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	257 {
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	258 bp_table::bp_lines retval;
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	259
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	260 for (const auto& lineno : lines)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	261 {
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	262 int line = set_breakpoint (lineno, condition);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	263
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	264 if (line)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	265 {
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	266 if (! file.empty ())
313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	267 evmgr.update_breakpoint (true, file, line, condition);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	268
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	269 retval.insert (line);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	270 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	271 }
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	272
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	273 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	274 }
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	275
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	276 bp_table::bp_lines
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	277 tree_statement_list::remove_all_breakpoints (event_manager& evmgr,
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	278 const std::string& file)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	279 {
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	280 bp_table::bp_lines retval;
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	281
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	282 octave_value_list bkpts = list_breakpoints ();
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	283
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	284 for (int i = 0; i < bkpts.length (); i++)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	285 {
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	286 int lineno = bkpts(i).int_value ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	287
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	288 delete_breakpoint (lineno);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	289
29457 313b8b897733 revamp handling of breakpoint line positions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	290 retval.insert (lineno);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	291
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	292 if (! file.empty ())
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	293 evmgr.update_breakpoint (false, file, lineno);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	294 }
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	295
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	296 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	297 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	298 }

Mercurial > octave

annotate libinterp/parse-tree/pt-stmt.cc @ 29457:313b8b897733