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

annotate libinterp/parse-tree/pt-stmt.cc @ 26113:8a15f3bace49

move eval_string inside interpreter/evaluator class * tree_evaluator.h, tree_evaluator.cc (tree_evaluator::eval_string): New functions. * interpreter.h, interpreter.cc (interpreter::eval_string): New functions. Forward to evaluator eval_string functions. * parse.h, oct-parse.yy (eval_string): Deprecate and forward to interpreter eval_string functions. Change all uses. * pt.h, pt.cc (tree::meets_bp_condition): Accept reference to tree_evaluator as argument. Change all uses. (tree::is_breakpoint): Split into separate is_breakpoint and is_active_breakpoint functions. Change all uses.

author	John W. Eaton <jwe@octave.org>
date	Fri, 16 Nov 2018 13:16:50 -0500
parents	6652d3823428
children	00f796120a6d

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
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24846 diff changeset	3 Copyright (C) 1996-2018 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23750 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23750 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
2982 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23750 diff changeset	19 <https://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
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2982 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
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	31 #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	32 #include "comment-list.h"
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	33 #include "input.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	34 #include "oct-lvalue.h"
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	35 #include "octave-link.h"
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	36 #include "ov.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	37 #include "pager.h"
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	38 #include "pt-bp.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	39 #include "pt-cmd.h"
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	40 #include "pt-eval.h"
2982 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"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	47 #include "utils.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	48 #include "variables.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	49
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	50 namespace octave
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	51 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	52 // 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	53
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	54 tree_statement::~tree_statement (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	55 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	56 delete m_command;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	57 delete m_expression;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	58 delete m_comment_list;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 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
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	61 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	62 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	63 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	64 if (m_expression)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	65 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	66 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	67
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	68 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	69 tree_statement::print_result (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	70 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	71 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	72 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	73
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	74 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	75 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	76 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	77 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	78 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	79 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	80 m_expression->set_breakpoint (condition);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	81 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	82
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	83 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	84 tree_statement::delete_breakpoint (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	85 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	86 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	87 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	88 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	89 m_expression->delete_breakpoint ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	90 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	91
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	92 bool
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	93 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	94 {
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	95 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	96 : (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	97 }
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	98
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	99 bool
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	100 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	101 {
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	102 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	103 : (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	104 }
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	105
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	106 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	107 tree_statement::bp_cond () const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	108 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	109 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	110 ? 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	111 : (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	112 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	113
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	114 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	115 tree_statement::line (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	116 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	117 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	118 ? m_command->line ()
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 : (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	120 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	121
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	122 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	123 tree_statement::column (void) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	124 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	125 return (m_command
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 ? m_command->column ()
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 : (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	128 }
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	129
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	130 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	131 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	132 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 if (m_command)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 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	135 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	136 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	137 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	138
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	139 void
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23656 diff changeset	140 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	141 {
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_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	143
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	144 accept (tpc);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	145 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	146
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	147 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	148 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	149 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	150 bool retval = false;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	151
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 if (m_command)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	153 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	154 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	155 = dynamic_cast<tree_no_op_command *> (m_command);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	156
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	157 if (no_op_cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	158 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	159 }
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	160
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	161 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	162 }
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	163
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	164 bool
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	165 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	166 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	167 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	168
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	169 if (m_command)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	170 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	171 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	172 = 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	173
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	174 if (no_op_cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	175 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	176 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	177
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	178 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	179 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	180
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 // 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	182 // statement list
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	183 // (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	184
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	185 int
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	186 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	187 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	188 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	189 accept (tbp);
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	190
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	191 return tbp.get_line ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	192 }
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	193
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	194 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	195 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	196 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	197 if (line < 0)
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 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	200
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	201 int len = bp_lst.length ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	202
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	203 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	204 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	205 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	206 accept (tbp);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	207 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	208 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	209 else
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 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	212 accept (tbp);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	213 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	214 }
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	215
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	216 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	217 tree_statement_list::list_breakpoints (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	218 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	219 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	220 accept (tbp);
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	221
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	222 return tbp.get_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	223 }
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	224
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	225 // 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	226 std::list<bp_type>
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	227 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	228 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	229 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	230 accept (tbp);
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	231
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	232 std::list<bp_type> retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	233 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	234 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	235
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	236 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	237 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	238 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	239 conds(i).string_value ()));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	240 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	241
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	242 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	243 }
21157 94fc5f13d51b dbstop: conditional breakpoint, dbstop if caught error etc. (bug #46795) Lachlan Andrew <lachlanbis@gmail.com> parents: 21100 diff changeset	244
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	245 // 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	246 // of line), to stop only if condition is true.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	247 // Updates GUI via octave_link::update_breakpoint.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	248 // 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	249
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	250 bp_table::intmap
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	251 tree_statement_list::add_breakpoint (const std::string& file,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	252 const bp_table::intmap& line,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	253 const std::string& condition)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	254 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	255 bp_table::intmap retval;
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	256
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	257 octave_idx_type len = line.size ();
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	258
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	259 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	260 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	261 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	262
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	263 if (p != line.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	264 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	265 int lineno = p->second;
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	266
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	267 retval[i] = set_breakpoint (lineno, condition);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	268
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	269 if (retval[i] != 0 && ! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	270 octave_link::update_breakpoint (true, file, retval[i], condition);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	271 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	272 }
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	273
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	274 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	275 }
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	276
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	277 bp_table::intmap
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	278 tree_statement_list::remove_all_breakpoints (const std::string& file)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	279 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	280 bp_table::intmap 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 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	286 int lineno = static_cast<int> (bkpts(i).int_value ());
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
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	290 retval[i] = 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 ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	293 octave_link::update_breakpoint (false, file, lineno);
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 @ 26113:8a15f3bace49