octave: libinterp/parse-tree/bp-table.cc annotate

annotate libinterp/parse-tree/bp-table.cc @ 27971:ec769a7ab9fb

fix more spelling errors (bug #57613)

author	John W. Eaton <jwe@octave.org>
date	Tue, 21 Jan 2020 09:20:15 -0600
parents	b018f553fd85
children	376ca9022b7e 0a5b15007766

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 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2001-2020 The Octave Project Developers
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 ////////////////////////////////////////////////////////////////////////
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	25
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	29
23824 061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23807 diff changeset	30 #include <algorithm>
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <limits>
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <list>
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include <map>
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <set>
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include <string>
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	36
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "file-ops.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	38
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "bp-table.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "defun-int.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "error.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	42 #include "event-manager.h"
25347 af3319d86a5f eliminate some global references to interpreter internals John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	43 #include "interpreter.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	44 #include "interpreter-private.h"
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "oct-map.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "ov-usr-fcn.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "ov.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "ovl.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "pager.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "parse.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "pt-eval.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	52 #include "pt-exp.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "pt-stmt.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	54 #include "sighandlers.h"
334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	55
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	56 namespace octave
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	57 {
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	58 // Clear all reasons to stop, other than breakpoints.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	59
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	60 void bp_table::dbclear_all_signals (void)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	61 {
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	62 interpreter& interp = m_evaluator.get_interpreter ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	63 error_system& es = interp.get_error_system ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	64
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	65 es.debug_on_error (false);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 bp_table::m_errors_that_stop.clear ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	67
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	68 es.debug_on_caught (false);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	69 bp_table::m_caught_that_stop.clear ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	70
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	71 es.debug_on_warning (false);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	72 bp_table::m_warnings_that_stop.clear ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	74 Vdebug_on_interrupt = false;
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	75 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	76
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	77 // Process the "warn", "errs", "caught" and "intr" fields for a call of
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	78 // "dbstop (p)".
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	79
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	80 void bp_table::dbstop_process_map_args (const octave_map& mv)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	81 {
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	82 interpreter& interp = m_evaluator.get_interpreter ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	83 error_system& es = interp.get_error_system ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	84
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	85 // process errs
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	86 // why so many levels of indirection needed?
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	87 bool fail = false;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	88 Cell U = mv.contents ("errs");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	89 if (U.numel () != 1)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	90 fail = (U.numel () > 1);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	91 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	92 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	93 Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	94 if (W.isempty () \|\| W(0).isempty ())
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	95 es.debug_on_error (true); // like "dbstop if error" with no identifier
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	96 else if (! W(0).iscell ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	97 fail = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	98 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	99 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	100 Cell V = W(0).cell_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	101 for (int i = 0; i < V.numel (); i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	102 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	103 m_errors_that_stop.insert (V(i).string_value ());
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	104 es.debug_on_error (true);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	105 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	106 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	107 }
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	108
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	109 if (fail)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	110 error ("dbstop: invalid 'errs' field");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	111
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	112 // process caught
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	113 // why so many levels of indirection needed?
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	114 fail = false;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	115 U = mv.contents ("caught");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	116 if (U.numel () != 1)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	117 fail = (U.numel () > 1);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	118 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	120 Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	121 if (W.isempty () \|\| W(0).isempty ())
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	122 es.debug_on_caught (true); // like "dbstop if caught error" with no ID
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	123 else if (! W(0).iscell ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	124 fail = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	125 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	127 Cell V = W(0).cell_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	128 for (int i = 0; i < V.numel (); i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	130 m_caught_that_stop.insert (V(i).string_value ());
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	131 es.debug_on_caught (true);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	133 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 }
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	135
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 if (fail)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	137 error ("dbstop: invalid 'caught' field");
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	138
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	139 // process warn
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 // why so many levels of indirection needed?
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 fail = false;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	142 U = mv.contents ("warn");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	143 if (U.numel () != 1)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	144 fail = (U.numel () > 1);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	145 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	146 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	148 if (W.isempty () \|\| W(0).isempty ())
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	149 es.debug_on_warning (true); // like "dbstop if warning" with no identifier
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	150 else if (! W(0).iscell ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	151 fail = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	153 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	154 Cell V = W(0).cell_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	155 for (int i = 0; i < V.numel (); i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	156 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	157 m_warnings_that_stop.insert (V(i).string_value ());
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	158 es.debug_on_warning (true);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	159 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	160 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	161 }
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	162
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	163 if (fail)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	164 error ("dbstop: invalid 'warn' field");
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	165
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	166 // process interrupt
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	167 if (mv.isfield ("intr"))
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	168 Vdebug_on_interrupt = true;
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	169 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	170
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	171 // Insert a breakpoint in function fcn at line within file fname,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	172 // to stop only when condition is true.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	173 // Record in m_bp_set that fname contains a breakpoint.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	175 bool bp_table::add_breakpoint_1 (octave_user_code *fcn,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	176 const std::string& fname,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	177 const bp_table::intmap& line,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	178 const std::string& condition,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	179 bp_table::intmap& retval)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	180 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 bool found = false;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	182
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	183 tree_statement_list *cmds = fcn->body ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	184
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	185 std::string file = fcn->fcn_file_name ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	186
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	187 if (cmds)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	188 {
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	189 interpreter& interp = m_evaluator.get_interpreter ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	190
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	191 event_manager& evmgr = interp.get_event_manager ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	192
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	193 retval = cmds->add_breakpoint (evmgr, file, line, condition);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	194
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	195 for (auto& idx_line_p : retval)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	196 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	197 if (idx_line_p.second != 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	198 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	199 // Normalize to store only the file name.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	200 // Otherwise, there can be an entry for both
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	201 // file>subfunction and file, which causes a crash on
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	202 // dbclear all
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	203 const char *s = strchr (fname.c_str (), '>');
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	204 if (s)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	205 m_bp_set.insert (fname.substr (0, s - fname.c_str ()));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	206 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	207 m_bp_set.insert (fname);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	208 found = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	209 break;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	210 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	211 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	212 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	213
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	214 return found;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	215 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	216
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	217 // Cursory check that cond is a valid condition to use for a breakpoint.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	218 // Currently allows conditions with side-effects, like 'y+=10' and 'y++';
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	219 // it is odd that the former is not flagged by "is_assignment_expression".
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	220 // Throws an exception if not valid.
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	221
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	222 bool bp_table::condition_valid (const std::string& cond)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	223 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	224 if (cond.length () > 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	225 {
25441 143007dad864 store reference instead of pointer to interpreter in lexer John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	226 // ; to reject partial expr like "y=="
143007dad864 store reference instead of pointer to interpreter in lexer John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	227 parser parser (cond + " ;", m_evaluator.get_interpreter ());
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	228 parser.reset ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	229 int parse_status = parser.run ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	230 if (parse_status)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	231 error ("dbstop: Cannot parse condition '%s'", cond.c_str ());
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	232 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	233 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	234 tree_statement *stmt = nullptr;
27504 7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	235
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	236 std::shared_ptr<tree_statement_list> stmt_list
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	237 = parser.statement_list ();
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	238
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	239 if (! stmt_list)
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	240 error ("dbstop: "
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	241 "condition is not empty, but has nothing to evaluate");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	242 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	243 {
27504 7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	244 if (stmt_list->length () == 1
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	245 && (stmt = stmt_list->front ())
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	246 && stmt->is_expression ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	247 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	248 tree_expression *expr = stmt->expression ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	249 if (expr->is_assignment_expression ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	250 error ("dbstop: condition cannot be an assignment. "
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	251 "Did you mean '=='?");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	252 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	253 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	254 error ("dbstop: condition must be an expression");
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	255 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	256 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	257 }
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	258
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	259 return true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	260 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	261
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	262 enum dbstop_args
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	263 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	264 dbstop_in,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	265 dbstop_at,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	266 dbstop_if,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	267 dbstop_none
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	268 };
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	269
27971 ec769a7ab9fb fix more spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	270 // FIXME: This function probably needs to be completely overhauled to
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	271 // correctly parse the full syntax of the dbstop command and properly
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	272 // reject incorrect forms.
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	273
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	274 // Parse parameters (args) of dbstop and dbclear commands.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	275 // For dbstop, who=="dbstop"; for dbclear, who=="dbclear".
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	276 // The syntax is: dbstop [[in] symbol] [[at] [method \| line [line [...]]]] [if condition]
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	277 // where the form of condition depends on whether or not a file or line has
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	278 // been seen. IF symbol and method are specified, then symbol should
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	279 // be a class name. Otherwise it should be a function name.
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	280 // Also execute "if [error\|warning\|interrupt\|naninf]" clauses.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	281
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	282 void bp_table::parse_dbfunction_params (const char *who,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	283 const octave_value_list& args,
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	284 std::string& func_name,
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	285 std::string& class_name,
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	286 bp_table::intmap& lines,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	287 std::string& cond)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	288 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	289 int nargin = args.length ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	290 int list_idx = 0;
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	291 func_name = "";
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	292 class_name = "";
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	293 lines = bp_table::intmap ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	294
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	295 if (nargin == 0 \|\| ! args(0).is_string ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	296 print_usage (who);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	297
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	298 // elements already processed
26586 5fec5393a9c8 bp-table.cc: Don't declare and initialize multiple vars on one line. Rik <rik@octave.org> parents: 26376 diff changeset	299 bool seen_in = false;
5fec5393a9c8 bp-table.cc: Don't declare and initialize multiple vars on one line. Rik <rik@octave.org> parents: 26376 diff changeset	300 bool seen_at = false;
5fec5393a9c8 bp-table.cc: Don't declare and initialize multiple vars on one line. Rik <rik@octave.org> parents: 26376 diff changeset	301 bool seen_if = false;
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	302 int pos = 0;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	303 dbstop_args tok = dbstop_none;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	304 while (pos < nargin)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	305 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	306 // allow "in" and "at" to be implicit
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	307 if (args(pos).is_string ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	308 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	309 std::string arg = args(pos).string_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	310 if (arg == "in")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	311 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	312 tok = dbstop_in;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	313 pos++;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	314 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	315 else if (arg == "at")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	316 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	317 tok = dbstop_at;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	318 pos++;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	319 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	320 else if (arg == "if")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	321 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	322 tok = dbstop_if;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	323 pos++;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	324 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	325 else if (atoi (args(pos).string_value ().c_str ()) > 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	326 tok = dbstop_at;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	327 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	328 tok = dbstop_in;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	329 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	330 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	331 tok = dbstop_at;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	332
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	333 if (pos >= nargin)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	334 error ("%s: '%s' missing argument", who,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	335 (tok == dbstop_in
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	336 ? "in" : (tok == dbstop_at ? "at" : "if")));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	337
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	338 // process the actual arguments
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	339 switch (tok)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	340 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	341 case dbstop_in:
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	342 func_name = args(pos).string_value ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	343 if (seen_in)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	344 error ("%s: Too many function names specified -- %s",
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	345 who, func_name.c_str ());
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	346 else if (seen_at \|\| seen_if)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	347 error ("%s: function name must come before line number and 'if'",
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	348 who);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	349 seen_in = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	350 pos++;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	351 break;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	352
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	353 case dbstop_at:
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	354 if (seen_at)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	355 error ("%s: Only one 'at' clause is allowed -- %s",
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	356 who, args(pos).string_value ().c_str ());
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	357 else if (seen_if)
26107 05dfcb24ef12 Supply missing arguments to variable length printf functions (bug #55046). Rik <rik@octave.org>* parents: 25441 diff changeset	358 error ("%s: line number must come before 'if' clause\n", who);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	359 seen_at = true;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	360
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	361 if (seen_if)
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	362 error ("%s: line number must come before 'if' clause\n", who);
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	363 else if (seen_in)
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	364 {
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	365 std::string arg = args(pos).string_value ();
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	366
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	367 // FIXME: we really want to distinguish number
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	368 // vs. method name here.
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	369
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	370 if (atoi (arg.c_str ()) == 0)
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	371 {
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	372 // We have class and function names but already
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	373 // stored the class name in func_name.
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	374 class_name = func_name;
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	375 func_name = arg;
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	376 pos++;
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	377 break;
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	378 }
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	379
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	380 }
6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	381 else
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	382 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	383 // It was a line number. Get function name from debugger.
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	384 if (m_evaluator.in_debug_repl ())
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	385 func_name = m_evaluator.get_user_code ()->profiler_name ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	386 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	387 error ("%s: function name must come before line number "
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	388 "and 'if'", who);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	389 seen_in = true;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	390 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	391
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	392 // Read a list of line numbers (or arrays thereof)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	393 for ( ; pos < nargin; pos++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	394 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	395 if (args(pos).is_string ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	396 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	397 int line = atoi (args(pos).string_value ().c_str ());
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	398
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	399 if (line > 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	400 lines[list_idx++] = line;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	401 else
26954 6e50f1fedeb5 dbstop: accept "at CLASS in METHOD" syntax (partial fix for bug #45404) John W. Eaton <jwe@octave.org> parents: 26586 diff changeset	402 break; // may be "if" or a method name
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	403 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	404 else if (args(pos).isnumeric ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	405 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	406 const NDArray arg = args(pos).array_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	407
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	408 for (octave_idx_type j = 0; j < arg.numel (); j++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	409 lines[list_idx++] = static_cast<int> (arg.elem (j));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	410 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	411 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	412 error ("%s: Invalid argument type %s",
26107 05dfcb24ef12 Supply missing arguments to variable length printf functions (bug #55046). Rik <rik@octave.org>* parents: 25441 diff changeset	413 who, args(pos).type_name ().c_str ());
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	414 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	415 break;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	416
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	417 case dbstop_if:
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	418 if (seen_in) // conditional breakpoint
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	419 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	420 cond = ""; // remaining arguments form condition
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	421 for (; pos < nargin; pos++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	422 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	423 if (args(pos).is_string ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	424 cond += ' ' + args(pos).string_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	425 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	426 error ("%s: arguments to 'if' must all be strings", who);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	427 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	428
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	429 cond = cond.substr (1); // omit initial space
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	430 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	431 else // stop on event (error, warning, interrupt, NaN/inf)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	432 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	433 std::string condition = args(pos).string_value ();
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	434 bool on_off = ! strcmp (who, "dbstop");
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	435
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	436 // FIXME: the following seems a bit messy in the way it
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	437 // duplicates checks on CONDITION.
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	438
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	439 if (condition == "error")
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	440 process_id_list (who, condition, args, nargin, pos, on_off,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	441 m_errors_that_stop);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	442 else if (condition == "warning")
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	443 process_id_list (who, condition, args, nargin, pos, on_off,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	444 m_warnings_that_stop);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	445 else if (condition == "caught" && nargin > pos+1
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	446 && args(pos+1).string_value () == "error")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	447 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	448 pos++;
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	449 process_id_list (who, condition, args, nargin, pos, on_off,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	450 m_caught_that_stop);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	451 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	452 else if (condition == "interrupt")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	453 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	454 Vdebug_on_interrupt = on_off;
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	455 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	456 else if (condition == "naninf")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	457 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	458 #if defined (DBSTOP_NANINF)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	459 Vdebug_on_naninf = on_off;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	460 enable_fpe (on_off);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	461 #else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	462 warning ("%s: condition '%s' not yet supported",
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	463 who, condition.c_str ());
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	464 #endif
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	465 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	466 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	467 error ("%s: invalid condition %s",
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	468 who, condition.c_str ());
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	469
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	470 pos = nargin;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	471 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	472 break;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	473
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	474 default: // dbstop_none should never occur
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	475 break;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	476 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	477 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	478 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	479
27184 f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	480 /*
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	481 %!test
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	482 %! dbclear all; # Clear out breakpoints before test
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	483 %! dbstop help;
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	484 %! dbstop in ls;
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27913 diff changeset	485 %! dbstop help at 104;
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27913 diff changeset	486 %! dbstop in ls 102; ## 102 is a comment; code line is at 105
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27913 diff changeset	487 %! dbstop help 204 if a==5;
27184 f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	488 %! dbstop if error Octave:undefined-function;
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	489 %! s = dbstatus;
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	490 %! dbclear all;
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	491 %! assert ({s.bkpt(:).name}, {"help", "help", "help>do_contents", "ls", "ls"});
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	492 %! assert ([s.bkpt(:).line], [55, 105, 207, 63, 102]);
27184 f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	493 %! assert (s.errs, {"Octave:undefined-function"});
f7bf27159cf7 * bp-table.cc: Fix test. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	494 */
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	495
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	496 void bp_table::set_stop_flag (const char *who, const std::string& condition,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	497 bool on_off)
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	498 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	499 interpreter& interp = m_evaluator.get_interpreter ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	500 error_system& es = interp.get_error_system ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	501
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	502 if (condition == "error")
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	503 es.debug_on_error (on_off);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	504 else if (condition == "warning")
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	505 es.debug_on_warning (on_off);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	506 else if (condition == "caught")
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	507 es.debug_on_caught (on_off);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	508 else
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	509 error ("%s: internal error in set_stop_flag", who);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	510 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	511
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	512 void bp_table::process_id_list (const char *who,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	513 const std::string& condition,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	514 const octave_value_list& args,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	515 int nargin, int& pos, bool on_off,
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	516 std::set<std::string>& id_list)
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	517 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	518 pos++;
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	519
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	520 if (nargin > pos) // only affect a single error ID
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	521 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	522 if (! args(pos).is_string () \|\| nargin > pos+1)
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	523 error ("%s: ID must be a single string", who);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	524 else if (on_off)
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	525 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	526 id_list.insert (args(pos).string_value ());
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	527 set_stop_flag (who, condition, true);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	528 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	529 else
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	530 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	531 id_list.erase (args(pos).string_value ());
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	532 if (id_list.empty ())
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	533 set_stop_flag (who, condition, false);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	534 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	535 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	536 else // unqualified. Turn all on or off
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	537 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	538 id_list.clear ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	539 set_stop_flag (who, condition, on_off);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	540
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	541 if (condition == "error")
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	542 {
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	543 // Matlab stops on both.
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	544 Vdebug_on_interrupt = on_off;
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	545 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	546 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	547 }
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	548
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	549 // Return the sub/nested/main function of MAIN_FCN that contains
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	550 // line number LINENO of the source file.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	551 // If END_LINE != 0, *END_LINE is set to last line of the returned function.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	552
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	553 static octave_user_code * find_fcn_by_line (octave_user_code *main_fcn,
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	554 int lineno,
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	555 int *end_line = nullptr)
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	556 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	557 octave_user_code *retval = nullptr;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	558 octave_user_code *next_fcn = nullptr; // 1st function starting after lineno
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	559
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	560 // Find innermost nested (or parent) function containing lineno.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	561 int earliest_end = std::numeric_limits<int>::max ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	562
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	563 std::map<std::string, octave_value> subfcns = main_fcn->subfunctions ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	564 for (const auto& str_val_p : subfcns)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	565 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	566 if (str_val_p.second.is_user_function ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	567 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	568 auto *dbg_subfcn = str_val_p.second.user_function_value ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	569
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	570 // Check if lineno is within dbg_subfcn.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	571 // FIXME: we could break when beginning_line() > lineno,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	572 // but that makes the code "fragile"
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	573 // if the order of walking subfcns changes,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	574 // for a minor speed improvement in non-critical code.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	575 if (dbg_subfcn->ending_line () < earliest_end
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	576 && dbg_subfcn->ending_line () >= lineno
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	577 && dbg_subfcn->beginning_line () <= lineno)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	578 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	579 earliest_end = dbg_subfcn->ending_line ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	580 retval = find_fcn_by_line (dbg_subfcn, lineno, &earliest_end);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	581 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	582
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	583 // Find the first fcn starting after lineno.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	584 // This is used if line is not inside any function.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	585 if (dbg_subfcn->beginning_line () >= lineno && ! next_fcn)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	586 next_fcn = dbg_subfcn;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	587 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	588 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	589
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	590 // The breakpoint is either in the subfunction found above,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	591 // or in the main function, which we check now.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	592 if (main_fcn->is_user_function ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	593 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	594 int e = dynamic_cast<octave_user_function *> (main_fcn)->ending_line ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	595 if (e >= lineno && e < earliest_end)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	596 retval = main_fcn;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	597
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	598 if (! retval)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	599 retval = next_fcn;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	600 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	601 else // main_fcn is a script.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	602 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	603 if (! retval)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	604 retval = main_fcn;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	605 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	606
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	607 if (end_line && earliest_end < *end_line)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	608 *end_line = earliest_end;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	609
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	610 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	611 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	612
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	613 // Given file name fname, find the subfunction at line and create
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	614 // a breakpoint there. Put the system into debug_mode.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	615 bp_table::intmap bp_table::add_breakpoint (const std::string& fname,
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26954 diff changeset	616 const std::string& class_name,
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	617 const bp_table::intmap& line,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	618 const std::string& condition)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	619 {
26975 de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451) John W. Eaton <jwe@octave.org> parents: 26954 diff changeset	620 octave_user_code *main_fcn = m_evaluator.get_user_code (fname, class_name);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	621
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	622 if (! main_fcn)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	623 error ("add_breakpoint: unable to find function '%s'\n", fname.c_str ());
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	624
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	625 condition_valid (condition); // Throw error if condition not valid.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	626
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	627 intmap retval;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	628
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	629 octave_idx_type len = line.size ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	630
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	631 for (int i = 0; i < len; i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	632 {
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	633 const_intmap_iterator m = line.find (i);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	634
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	635 if (m != line.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	636 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	637 int lineno = m->second;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	638
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	639 octave_user_code *dbg_fcn = find_fcn_by_line (main_fcn, lineno);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	640
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	641 // We've found the right (sub)function. Now insert the breakpoint.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	642 // We insert all breakpoints.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	643 // If multiple are in the same function, we insert multiple times.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	644 intmap ret_one;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	645 if (dbg_fcn
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	646 && add_breakpoint_1 (dbg_fcn, fname, line, condition, ret_one))
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	647 retval.insert (std::pair<int,int> (i, ret_one.find (i)->second));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	648 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	649 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	650
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	651 m_evaluator.reset_debug_state ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	652
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	653 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	654 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	655
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	656 int bp_table::remove_breakpoint_1 (octave_user_code *fcn,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	657 const std::string& fname,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	658 const bp_table::intmap& line)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	659 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	660 int retval = 0;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	661
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	662 std::string file = fcn->fcn_file_name ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	663
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	664 tree_statement_list *cmds = fcn->body ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	665
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	666 // FIXME: move the operation on cmds to the tree_statement_list class?
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	667
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	668 if (cmds)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	669 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	670 octave_value_list results = cmds->list_breakpoints ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	671
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	672 if (results.length () > 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	673 {
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	674 interpreter& interp = m_evaluator.get_interpreter ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	675
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	676 event_manager& evmgr = interp.get_event_manager ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	677
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	678 octave_idx_type len = line.size ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	679
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	680 for (int i = 0; i < len; i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	681 {
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	682 const_intmap_iterator p = line.find (i);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	683
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	684 if (p != line.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	685 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	686 int lineno = p->second;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	687
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	688 cmds->delete_breakpoint (lineno);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	689
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	690 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	691 evmgr.update_breakpoint (false, file, lineno);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	692 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	693 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	694
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	695 results = cmds->list_breakpoints ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	696
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	697 auto it = m_bp_set.find (fname);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	698 if (results.empty () && it != m_bp_set.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	699 m_bp_set.erase (it);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	700 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	701
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	702 retval = results.length ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	703 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	704
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	705 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	706 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	707
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	708 int bp_table::remove_breakpoint (const std::string& fname,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	709 const bp_table::intmap& line)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	710 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	711 int retval = 0;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	712
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	713 octave_idx_type len = line.size ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	714
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	715 if (len == 0)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	716 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	717 intmap results = remove_all_breakpoints_in_file (fname);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	718 retval = results.size ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	719 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	720 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	721 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25347 diff changeset	722 octave_user_code *dbg_fcn = m_evaluator.get_user_code (fname);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	723
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	724 if (! dbg_fcn)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	725 error ("remove_breakpoint: unable to find function %s\n",
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	726 fname.c_str ());
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	727
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	728 retval = remove_breakpoint_1 (dbg_fcn, fname, line);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	729
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	730 // Search subfunctions in the order they appear in the file.
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	731
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	732 const std::list<std::string> subfcn_names
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	733 = dbg_fcn->subfunction_names ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	734
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	735 std::map<std::string, octave_value> subfcns
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	736 = dbg_fcn->subfunctions ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	737
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	738 for (const auto& subf_nm : subfcn_names)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	739 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	740 const auto q = subfcns.find (subf_nm);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	741
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	742 if (q != subfcns.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	743 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	744 octave_user_code *dbg_subfcn = q->second.user_code_value ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	745
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	746 retval += remove_breakpoint_1 (dbg_subfcn, fname, line);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	747 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	748 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	749 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	750
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	751 m_evaluator.reset_debug_state ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	752
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	753 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	754 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	755
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	756 // Remove all breakpoints from a file, including those in subfunctions.
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	757
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	758 bp_table::intmap
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	759 bp_table::remove_all_breakpoints_in_file (const std::string& fname,
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	760 bool silent)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	761 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	762 intmap retval;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	763
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25347 diff changeset	764 octave_user_code *dbg_fcn = m_evaluator.get_user_code (fname);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	765
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	766 if (dbg_fcn)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	767 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	768 std::string file = dbg_fcn->fcn_file_name ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	769
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	770 tree_statement_list *cmds = dbg_fcn->body ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	771
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	772 if (cmds)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	773 {
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	774 interpreter& interp = m_evaluator.get_interpreter ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	775
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	776 event_manager& evmgr = interp.get_event_manager ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27185 diff changeset	777
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	778 retval = cmds->remove_all_breakpoints (evmgr, file);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	779
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	780 auto it = m_bp_set.find (fname);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	781 if (it != m_bp_set.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	782 m_bp_set.erase (it);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	783 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	784 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	785 else if (! silent)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	786 error ("remove_all_breakpoint_in_file: "
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	787 "unable to find function %s\n", fname.c_str ());
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	788
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	789 m_evaluator.reset_debug_state ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	790
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	791 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	792 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	793
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	794 void bp_table::remove_all_breakpoints (void)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	795 {
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	796 // Odd loop structure required because delete will invalidate
416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	797 // m_bp_set iterators.
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	798 for (auto it = m_bp_set.cbegin (), it_next = it;
4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	799 it != m_bp_set.cend ();
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	800 it = it_next)
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	801 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	802 ++it_next;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	803 remove_all_breakpoints_in_file (*it);
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	804 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	805
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 27000 diff changeset	806 m_evaluator.reset_debug_state ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	807 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	808
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	809 std::string find_bkpt_list (octave_value_list slist, std::string match)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	810 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	811 std::string retval;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	812
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	813 for (int i = 0; i < slist.length (); i++)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	814 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	815 if (slist(i).string_value () == match)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	816 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	817 retval = slist(i).string_value ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	818 break;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	819 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	820 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	821
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	822 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	823 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	824
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	825 bp_table::fname_bp_map
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	826 bp_table::get_breakpoint_list (const octave_value_list& fname_list)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	827 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	828 fname_bp_map retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	829
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	830 // make copy since changes may invalidate iters of m_bp_set.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	831 std::set<std::string> tmp_bp_set = m_bp_set;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	832
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	833 for (auto& bp_fname : tmp_bp_set)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	834 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	835 if (fname_list.empty ()
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	836 \|\| find_bkpt_list (fname_list, bp_fname) != "")
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	837 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25347 diff changeset	838 octave_user_code *dbg_fcn = m_evaluator.get_user_code (bp_fname);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	839
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	840 if (dbg_fcn)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	841 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	842 tree_statement_list *cmds = dbg_fcn->body ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	843
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	844 // FIXME: move the operation on cmds to the
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	845 // tree_statement_list class?
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	846 if (cmds)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	847 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	848 std::list<bp_type> bkpts = cmds->breakpoints_and_conds ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	849
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	850 if (! bkpts.empty ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	851 retval[bp_fname] = bkpts;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	852 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	853
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	854 // look for breakpoints in subfunctions
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	855 const std::list<std::string> subf_nm
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	856 = dbg_fcn->subfunction_names ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	857
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	858 std::map<std::string, octave_value> subfcns
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	859 = dbg_fcn->subfunctions ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	860
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	861 for (const auto& subfcn_nm : subf_nm)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	862 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	863 const auto q = subfcns.find (subfcn_nm);
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	864
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	865 if (q != subfcns.end ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	866 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	867 octave_user_code *dbg_subfcn
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	868 = q->second.user_code_value ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	869
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	870 cmds = dbg_subfcn->body ();
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	871 if (cmds)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	872 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	873 std::list<bp_type> bkpts
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	874 = cmds->breakpoints_and_conds ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	875
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	876 if (! bkpts.empty ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	877 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	878 std::string key
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	879 = bp_fname + '>' + dbg_subfcn->name ();
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	880
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	881 retval[key] = bkpts;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	882 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	883 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	884 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	885 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	886 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	887 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	888 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	889
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	890 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	891 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	892
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	893 // Report the status of "dbstop if error ..." and "dbstop if warning ..."
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	894 // If to_screen is true, the output goes to octave_stdout; otherwise it is
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	895 // returned.
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	896 // If dbstop if error is true but no explicit IDs are specified, the return
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	897 // value will have an empty field called "errs". If IDs are specified, the
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	898 // "errs" field will have a row per ID. If dbstop if error is false, there
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	899 // is no "errs" field. The "warn" field is set similarly by dbstop if warning
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	900
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	901 octave_map bp_table::stop_on_err_warn_status (bool to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	902 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	903 octave_map retval;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	904
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	905 interpreter& interp = m_evaluator.get_interpreter ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	906 error_system& es = interp.get_error_system ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	907
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	908 // print dbstop if error information
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	909 if (es.debug_on_error ())
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	910 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	911 if (m_errors_that_stop.empty ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	912 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	913 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	914 octave_stdout << "stop if error\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	915 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	916 retval.assign ("errs", octave_value(""));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	917 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	918 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	919 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	920 Cell errs (dim_vector (bp_table::m_errors_that_stop.size (), 1));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	921 int i = 0;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	922
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	923 for (const auto& e : m_errors_that_stop)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	924 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	925 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	926 octave_stdout << "stop if error " << e << "\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	927 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	928 errs(i++) = e;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	929 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	930 if (! to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	931 retval.assign ("errs", octave_value (errs));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	932 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	933 }
24286 6bfb96ab73cb * bp-table.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 24279 diff changeset	934
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	935 // print dbstop if caught error information
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	936 if (es.debug_on_caught ())
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	937 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	938 if (m_caught_that_stop.empty ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	939 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	940 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	941 octave_stdout << "stop if caught error\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	942 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	943 retval.assign ("caught", octave_value(""));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	944 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	945 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	946 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	947 Cell errs (dim_vector (m_caught_that_stop.size (), 1));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	948 int i = 0;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	949
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	950 for (const auto& e : m_caught_that_stop)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	951 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	952 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	953 octave_stdout << "stop if caught error " << e << "\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	954 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	955 errs(i++) = e;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	956 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	957 if (! to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	958 retval.assign ("caught", octave_value (errs));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	959 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	960 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	961
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	962 // print dbstop if warning information
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	963 if (es.debug_on_warning ())
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	964 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	965 if (m_warnings_that_stop.empty ())
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	966 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	967 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	968 octave_stdout << "stop if warning\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	969 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	970 retval.assign ("warn", octave_value(""));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	971 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	972 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	973 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	974 Cell warn (dim_vector (m_warnings_that_stop.size (), 1));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	975 int i = 0;
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	976
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	977 for (const auto& w : m_warnings_that_stop)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	978 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	979 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	980 octave_stdout << "stop if warning " << w << "\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	981 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	982 warn(i++) = w;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	983 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	984 if (! to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	985 retval.assign ("warn", octave_value (warn));
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	986 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	987 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	988
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	989 // print dbstop if interrupt information
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	990 if (Vdebug_on_interrupt)
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	991 {
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	992 if (to_screen)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	993 octave_stdout << "stop if interrupt\n";
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	994 else
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	995 retval.assign ("intr", octave_value ());
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	996 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	997
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	998 return retval;
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	999 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1000
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1001 octave_user_code *
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1002 get_user_code (const std::string& fname)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1003 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25347 diff changeset	1004 tree_evaluator& tw = __get_evaluator__ ("get_user_code");
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1005
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25347 diff changeset	1006 return tw.get_user_code (fname);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1007 }
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1008 }

Mercurial > octave

annotate libinterp/parse-tree/bp-table.cc @ 27971:ec769a7ab9fb