octave: libinterp/corefcn/debug.cc annotate

annotate libinterp/corefcn/debug.cc @ 20918:6f0bd96f93c0

maint: Use new C++ archetype in more files. Place input validation first in files. Move declaration of retval down in function to be closer to point of usage. Eliminate else clause after if () error. Use "return ovl()" where it makes sense. * __dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __lin_interpn__.cc, balance.cc, betainc.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, dirfns.cc, dlmread.cc, dot.cc, eig.cc, error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, ov-type-conv.h: Use new C++ archetype in more files.

author	Rik <rik@octave.org>
date	Wed, 16 Dec 2015 15:00:31 -0800
parents	f1b2a2dbc0e1
children	667861ffffab

rev	line source
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	1 /*
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19597 diff changeset	3 Copyright (C) 2001-2015 Ben Sapp
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11058 diff changeset	4 Copyright (C) 2007-2009 John Swensen
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	5
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	7
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	11 option) any later version.
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	12
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	16 for more details.
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	17
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	20 <http://www.gnu.org/licenses/>.
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	21
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	22 */
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	24 #include <config.h>
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	25 #endif
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	26
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	27 #include <deque>
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	28 #include <fstream>
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	29 #include <iomanip>
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	30 #include <iostream>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	31 #include <set>
3948 126177939aae [project @ 2002-05-23 01:17:29 by jwe] jwe parents: 3947 diff changeset	32 #include <string>
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	33
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	34 #include "file-stat.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	35 #include "singleton-cleanup.h"
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	36
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	37 #include "defun.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	38 #include "error.h"
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	39 #include "help.h"
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	40 #include "input.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	41 #include "pager.h"
16418 e1d92db3a715 use octave-link instead of hooks for breakpoint set/clear functions John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	42 #include "octave-link.h"
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	43 #include "oct-obj.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	44 #include "utils.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	45 #include "parse.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	46 #include "symtab.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	47 #include "gripes.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	48 #include "ov.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	49 #include "ov-usr-fcn.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	50 #include "ov-fcn.h"
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	51 #include "ov-struct.h"
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	52 #include "pt-pr-code.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	53 #include "pt-bp.h"
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	54 #include "pt-eval.h"
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	55 #include "pt-stmt.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	56 #include "toplev.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	57 #include "unwind-prot.h"
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	58 #include "utils.h"
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	59 #include "variables.h"
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	60
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	61 #include "debug.h"
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	62
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	63 // Initialize the singleton object
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	64 bp_table *bp_table::instance = 0;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	65
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	66 static std::string
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	67 snarf_file (const std::string& fname)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	68 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	69 std::string retval;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	70
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	71 file_stat fs (fname);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	72
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	73 if (fs)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	74 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	75 size_t sz = fs.size ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	76
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	77 std::ifstream file (fname.c_str (), std::ios::in\|std::ios::binary);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	78
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	79 if (file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	80 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	81 std::string buf (sz+1, 0);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	82
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	83 file.read (&buf[0], sz+1);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	84
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	85 if (file.eof ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	86 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	87 // Expected to read the entire file.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	88 retval = buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	89 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	90 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	91 error ("error reading file %s", fname.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	92 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	93 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	94
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	95 return retval;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	96 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	97
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	98 static std::deque<size_t>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	99 get_line_offsets (const std::string& buf)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	100 {
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	101 // This could maybe be smarter. Is deque the right thing to use here?
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	102
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	103 std::deque<size_t> offsets;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	104
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	105 offsets.push_back (0);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	106
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	107 size_t len = buf.length ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	108
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	109 for (size_t i = 0; i < len; i++)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	110 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	111 char c = buf[i];
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	112
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	113 if (c == '\r' && ++i < len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	114 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	115 c = buf[i];
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	116
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	117 if (c == '\n')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	118 offsets.push_back (i+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	119 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	120 offsets.push_back (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	121 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	122 else if (c == '\n')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	123 offsets.push_back (i+1);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	124 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	125
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	126 offsets.push_back (len);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	127
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	128 return offsets;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	129 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	130
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	131 std::string
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	132 get_file_line (const std::string& fname, size_t line)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	133 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	134 std::string retval;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	135
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	136 static std::string last_fname;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	137
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	138 static std::string buf;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	139
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	140 static std::deque<size_t> offsets;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	141
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	142 if (fname != last_fname)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	143 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	144 buf = snarf_file (fname);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	145
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	146 offsets = get_line_offsets (buf);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	147 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	148
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	149 if (line > 0)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	150 line--;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	151
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	152 if (line < offsets.size () - 1)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	153 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	154 size_t bol = offsets[line];
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	155 size_t eol = offsets[line+1];
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	156
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	157 while (eol > 0 && eol > bol && (buf[eol-1] == '\n' \|\| buf[eol-1] == '\r'))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	158 eol--;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	159
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	160 retval = buf.substr (bol, eol - bol);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	161 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	162
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	163 return retval;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	164 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	165
5743 a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5645 diff changeset	166 // Return a pointer to the user-defined function FNAME. If FNAME is
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5645 diff changeset	167 // empty, search backward for the first user-defined function in the
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5645 diff changeset	168 // current call stack.
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	169
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	170 static octave_user_code *
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	171 get_user_code (const std::string& fname = std::string ())
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	172 {
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	173 octave_user_code *dbg_fcn = 0;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	174
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	175 if (fname.empty ())
7923 c3d21b9b94b6 eliminate octave_call_stack member functions caller_user_script and caller_user_function, and unused difference_type args John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	176 dbg_fcn = octave_call_stack::caller_user_code ();
5743 a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5645 diff changeset	177 else
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	178 {
18236 0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	179 std::string name = fname;
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	180
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	181 size_t name_len = name.length ();
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	182
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	183 if (! name.empty () && name_len > 2 && name.substr (name_len-2) == ".m")
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	184 name = name.substr (0, name_len-2);
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	185
0806c9e75e08 strip .m when setting or clearing breakpoints (bug #41126) John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	186 octave_value fcn = symbol_table::find_function (name);
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	187
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8114 diff changeset	188 if (fcn.is_defined () && fcn.is_user_code ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	189 dbg_fcn = fcn.user_code_value ();
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	190 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	191
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	192 return dbg_fcn;
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	193 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	194
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	195 static void
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	196 parse_dbfunction_params (const char *who, const octave_value_list& args,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	197 std::string& symbol_name, bp_table::intmap& lines)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	198 {
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	199 int idx = 0;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	200 int list_idx = 0;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	201 symbol_name = std::string ();
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	202 lines = bp_table::intmap ();
d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	203
d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	204 if (args.length () == 0)
d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	205 return;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	206
18377 7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	207 if (args(0).is_string ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	208 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	209 // string could be function name or line number
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	210 int isint = atoi (args(0).string_value ().c_str ());
18377 7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	211
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	212 if (isint == 0)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	213 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	214 // It was a function name
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	215 symbol_name = args(0).string_value ();
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	216
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	217 idx = 1;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	218 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	219 else
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	220 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	221 // It was a line number. Need to get function name from debugger.
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	222 if (Vdebugging)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	223 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	224 symbol_name = get_user_code ()->name ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	225 idx = 0;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	226 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	227 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	228 error ("%s: no function specified", who);
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	229 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	230 }
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	231 else if (args(0).is_map ())
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	232 {
18377 7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	233 // This is a problem because parse_dbfunction_params()
7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	234 // can only pass out a single function.
7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	235 error ("%s: struct input not implemented", who);
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	236 }
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	237 else
d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	238 error ("%s: invalid parameter specified", who);
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	239
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	240 for (int i = idx; i < args.length (); i++)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	241 {
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	242 if (args(i).is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	243 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14228 diff changeset	244 int line = atoi (args(i).string_value ().c_str ());
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	245
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	246 lines[list_idx++] = line;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	247 }
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	248 else if (args(i).is_map ())
18377 7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	249 octave_stdout << who << ": skipping struct input" << std::endl;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	250 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	251 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	252 const NDArray arg = args(i).array_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	253
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	254 for (octave_idx_type j = 0; j < arg.numel (); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	255 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	256 int line = static_cast<int> (arg.elem (j));
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	257
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	258 lines[list_idx++] = line;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	259 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	260 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	261 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	262 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	263
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	264 bool
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	265 bp_table::instance_ok (void)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	266 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	267 bool retval = true;
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	268
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	269 if (! instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	270 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	271 instance = new bp_table ();
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	272
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	273 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	274 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	275 }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	276
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	277 if (! instance)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	278 error ("unable to create breakpoint table!");
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	279
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	280 return retval;
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	281 }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13784 diff changeset	282
16596 645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	283 bool
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	284 bp_table::do_add_breakpoint_1 (octave_user_code *fcn,
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	285 const std::string& fname,
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	286 const bp_table::intmap& line,
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	287 bp_table::intmap& retval)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	288 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	289 bool found = false;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	290
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	291 tree_statement_list *cmds = fcn->body ();
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	292
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	293 std::string file = fcn->fcn_file_name ();
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	294
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	295 if (cmds)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	296 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	297 retval = cmds->add_breakpoint (file, line);
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	298
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	299 for (intmap_iterator p = retval.begin (); p != retval.end (); p++)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	300 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	301 if (p->second != 0)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	302 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	303 bp_set.insert (fname);
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	304 found = true;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	305 break;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	306 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	307 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	308 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	309
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	310 return found;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	311 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	312
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	313 bp_table::intmap
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	314 bp_table::do_add_breakpoint (const std::string& fname,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	315 const bp_table::intmap& line)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	316 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	317 intmap retval;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	318
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	319 octave_user_code *dbg_fcn = get_user_code (fname);
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	320
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	321 if (dbg_fcn)
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	322 {
16596 645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	323 if (! do_add_breakpoint_1 (dbg_fcn, fname, line, retval))
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	324 {
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	325 // Search subfunctions in the order they appear in the file.
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	326
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	327 const std::list<std::string> subfcn_names
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	328 = dbg_fcn->subfunction_names ();
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	329
16596 645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	330 std::map<std::string, octave_value> subfcns
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	331 = dbg_fcn->subfunctions ();
16531 f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	332
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	333 for (std::list<std::string>::const_iterator p = subfcn_names.begin ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	334 p != subfcn_names.end (); p++)
16531 f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	335 {
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	336 std::map<std::string, octave_value>::const_iterator
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	337 q = subfcns.find (*p);
16596 645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	338
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	339 if (q != subfcns.end ())
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	340 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	341 octave_user_code *dbg_subfcn = q->second.user_code_value ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	342
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	343 if (do_add_breakpoint_1 (dbg_subfcn, fname, line, retval))
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	344 break;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	345 }
16531 f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	346 }
f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	347 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	348 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	349 else
14049 b5a8e245b4eb Change phrasing to more assertive error() messages in debug commands Rik <octave@nomad.inbox5.com> parents: 14035 diff changeset	350 error ("add_breakpoint: unable to find the requested function\n");
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	351
10194 d4f813c3f5ed more debug mode fixes John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	352 tree_evaluator::debug_mode = bp_table::have_breakpoints () \|\| Vdebugging;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	353
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	354 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	355 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	356
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	357 int
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	358 bp_table::do_remove_breakpoint_1 (octave_user_code *fcn,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	359 const std::string& fname,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	360 const bp_table::intmap& line)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	361 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	362 int retval = 0;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	363
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	364 std::string file = fcn->fcn_file_name ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	365
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	366 tree_statement_list *cmds = fcn->body ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	367
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	368 // FIXME: move the operation on cmds to the tree_statement_list class?
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	369
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	370 if (cmds)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	371 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	372 octave_value_list results = cmds->list_breakpoints ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	373
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	374 if (results.length () > 0)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	375 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	376 octave_idx_type len = line.size ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	377
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	378 for (int i = 0; i < len; i++)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	379 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	380 const_intmap_iterator p = line.find (i);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	381
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	382 if (p != line.end ())
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	383 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	384 int lineno = p->second;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	385
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	386 cmds->delete_breakpoint (lineno);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	387
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	388 if (! file.empty ())
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	389 octave_link::update_breakpoint (false, file, lineno);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	390 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	391 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	392
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	393 results = cmds->list_breakpoints ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	394
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	395 bp_set_iterator it = bp_set.find (fname);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	396 if (results.length () == 0 && it != bp_set.end ())
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	397 bp_set.erase (it);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	398 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	399
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	400 retval = results.length ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	401 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	402
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	403 return retval;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	404 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	405
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	406 int
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	407 bp_table::do_remove_breakpoint (const std::string& fname,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	408 const bp_table::intmap& line)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	409 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	410 int retval = 0;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	411
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	412 octave_idx_type len = line.size ();
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	413
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	414 if (len == 0)
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	415 {
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	416 intmap results = remove_all_breakpoints_in_file (fname);
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	417 retval = results.size ();
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	418 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	419 else
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	420 {
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	421 octave_user_code *dbg_fcn = get_user_code (fname);
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	422
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	423 if (dbg_fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	424 {
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	425 retval = do_remove_breakpoint_1 (dbg_fcn, fname, line);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16342 diff changeset	426
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	427 // Search subfunctions in the order they appear in the file.
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	428
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	429 const std::list<std::string> subfcn_names
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	430 = dbg_fcn->subfunction_names ();
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	431
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	432 std::map<std::string, octave_value> subfcns
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	433 = dbg_fcn->subfunctions ();
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	434
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	435 for (std::list<std::string>::const_iterator p = subfcn_names.begin ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	436 p != subfcn_names.end (); p++)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	437 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	438 std::map<std::string, octave_value>::const_iterator
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	439 q = subfcns.find (*p);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16342 diff changeset	440
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	441 if (q != subfcns.end ())
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	442 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	443 octave_user_code *dbg_subfcn = q->second.user_code_value ();
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	444
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	445 retval += do_remove_breakpoint_1 (dbg_subfcn, fname, line);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	446 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	447 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	448 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	449 else
14049 b5a8e245b4eb Change phrasing to more assertive error() messages in debug commands Rik <octave@nomad.inbox5.com> parents: 14035 diff changeset	450 error ("remove_breakpoint: unable to find the requested function\n");
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	451 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	452
10194 d4f813c3f5ed more debug mode fixes John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	453 tree_evaluator::debug_mode = bp_table::have_breakpoints () \|\| Vdebugging;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	454
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	455 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	456 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	457
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	458 // Remove all breakpoints from a file, including those in subfunctions
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	459 bp_table::intmap
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	460 bp_table::do_remove_all_breakpoints_in_file (const std::string& fname,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	461 bool silent)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	462 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	463 intmap retval;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	464
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	465 octave_user_code *dbg_fcn = get_user_code (fname);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	466
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	467 if (dbg_fcn)
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	468 {
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	469 std::string file = dbg_fcn->fcn_file_name ();
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16342 diff changeset	470
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	471 tree_statement_list *cmds = dbg_fcn->body ();
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	472
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	473 if (cmds)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	474 {
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	475 retval = cmds->remove_all_breakpoints (file);
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	476
20674 78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	477 bp_set_iterator it = bp_set.find (fname);
78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	478 if (it != bp_set.end ())
78b3e9868b67 Fix segfault with 'dbclear all' (bug #41843). Lachlan Andrew <lachlanbis@gmail.com> parents: 20172 diff changeset	479 bp_set.erase (it);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	480 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	481 }
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8114 diff changeset	482 else if (! silent)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	483 error ("remove_all_breakpoint_in_file: "
14049 b5a8e245b4eb Change phrasing to more assertive error() messages in debug commands Rik <octave@nomad.inbox5.com> parents: 14035 diff changeset	484 "unable to find the requested function\n");
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	485
10194 d4f813c3f5ed more debug mode fixes John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	486 tree_evaluator::debug_mode = bp_table::have_breakpoints () \|\| Vdebugging;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	487
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	488 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	489 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	490
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	491 void
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	492 bp_table::do_remove_all_breakpoints (void)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	493 {
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	494 // Odd loop structure required because delete will invalidate bp_set iterators
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	495 for (const_bp_set_iterator it=bp_set.begin (), it_next=it;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	496 it != bp_set.end ();
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	497 it=it_next)
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	498 {
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	499 ++it_next;
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	500 remove_all_breakpoints_in_file (*it);
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	501 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	502
10194 d4f813c3f5ed more debug mode fixes John W. Eaton <jwe@octave.org> parents: 10186 diff changeset	503 tree_evaluator::debug_mode = bp_table::have_breakpoints () \|\| Vdebugging;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	504 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	505
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	506 std::string
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	507 do_find_bkpt_list (octave_value_list slist,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	508 std::string match)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	509 {
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	510 std::string retval;
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	511
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	512 for (int i = 0; i < slist.length (); i++)
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	513 {
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	514 if (slist(i).string_value () == match)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	515 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	516 retval = slist(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	517 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	518 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	519 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	520
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	521 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	522 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	523
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	524 bp_table::fname_line_map
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	525 bp_table::do_get_breakpoint_list (const octave_value_list& fname_list)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	526 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	527 fname_line_map retval;
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	528
9183 94ae487acd1b use set instead of map to keep track of debugger breakpoints jpswensen@compsci34-754-2010.compscidhcp.jhu.edu parents: 9039 diff changeset	529 for (bp_set_iterator it = bp_set.begin (); it != bp_set.end (); it++)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	530 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	531 if (fname_list.length () == 0
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	532 \|\| do_find_bkpt_list (fname_list, *it) != "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	533 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	534 octave_user_code f = get_user_code (it);
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	535
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	536 if (f)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	537 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	538 tree_statement_list *cmds = f->body ();
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	539
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	540 // FIXME: move the operation on cmds to the
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	541 // tree_statement_list class?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	542 if (cmds)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	543 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	544 octave_value_list bkpts = cmds->list_breakpoints ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	545 octave_idx_type len = bkpts.length ();
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	546
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	547 if (len > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	548 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	549 bp_table::intmap bkpts_vec;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	550
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	551 for (int i = 0; i < len; i++)
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	552 bkpts_vec[i] = bkpts(i).double_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	553
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	554 std::string symbol_name = f->name ();
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	555
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	556 retval[symbol_name] = bkpts_vec;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	557 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	558 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	559 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	560 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	561 }
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	562
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	563 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	564 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	565
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	566 static octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	567 intmap_to_ov (const bp_table::intmap& line)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	568 {
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	569 int idx = 0;
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	570
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	571 NDArray retval (dim_vector (1, line.size ()));
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	572
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	573 for (size_t i = 0; i < line.size (); i++)
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	574 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	575 bp_table::const_intmap_iterator p = line.find (i);
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	576
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	577 if (p != line.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	578 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	579 int lineno = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	580 retval(idx++) = lineno;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	581 }
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	582 }
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	583
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	584 retval.resize (dim_vector (1, idx));
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	585
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	586 return retval;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	587 }
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	588
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	589 DEFUN (dbstop, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	590 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	591 @deftypefn {} {} dbstop @var{func}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	592 @deftypefnx {} {} dbstop @var{func} @var{line}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	593 @deftypefnx {} {} dbstop @var{func} @var{line1} @var{line2} @dots{}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	594 @deftypefnx {} {} dbstop @var{line} @dots{}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	595 @deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\")\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	596 @deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\", @var{line})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	597 @deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	598 @deftypefnx {} {} dbstop (\"@var{func}\", [@var{line1}, @dots{}])\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	599 @deftypefnx {} {} dbstop (@var{line}, @dots{})\n\
18380 b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	600 Set a breakpoint at line number @var{line} in function @var{func}.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	601 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	602 Arguments are\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	603 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	604 @table @var\n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	605 @item func\n\
18380 b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	606 Function name as a string variable. When already in debug mode this argument\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	607 can be omitted and the current function will be used.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10839 diff changeset	608 \n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	609 @item line\n\
18380 b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	610 Line number where the breakpoint should be set. Multiple lines may be given\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	611 as separate arguments or as a vector.\n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	612 @end table\n\
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	613 \n\
18380 b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	614 When called with a single argument @var{func}, the breakpoint is set at the\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	615 first executable line in the named function.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	616 \n\
18380 b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	617 The optional output @var{rline} is the real line number where the breakpoint\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	618 was set. This can differ from the specified line if the line is not\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	619 executable. For example, if a breakpoint attempted on a blank line then\n\
b48391da83fc doc: Improve docstrings for dbstop, dbup, dbdown. Rik <rik@octave.org> parents: 18379 diff changeset	620 Octave will set the real breakpoint at the next executable line.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	621 @seealso{dbclear, dbstatus, dbstep, debug_on_error, debug_on_warning, debug_on_interrupt}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	622 @end deftypefn")
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	623 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	624 bp_table::intmap retval;
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	625 std::string symbol_name;
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	626 bp_table::intmap lines;
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	627
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	628 parse_dbfunction_params ("dbstop", args, symbol_name, lines);
6646 bd0a70c3f2db [project @ 2007-05-22 02:27:43 by jwe] jwe parents: 6317 diff changeset	629
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	630 if (lines.size () == 0)
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	631 lines[0] = 1;
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	632
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	633 retval = bp_table::add_breakpoint (symbol_name, lines);
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	634
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	635 return intmap_to_ov (retval);
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	636 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	637
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	638 DEFUN (dbclear, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	639 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	640 @deftypefn {} {} dbclear @var{func}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	641 @deftypefnx {} {} dbclear @var{func} @var{line}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	642 @deftypefnx {} {} dbclear @var{func} @var{line1} @var{line2} @dots{}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	643 @deftypefnx {} {} dbclear @var{line} @dots{}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	644 @deftypefnx {} {} dbclear all\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	645 @deftypefnx {} {} dbclear (\"@var{func}\")\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	646 @deftypefnx {} {} dbclear (\"@var{func}\", @var{line})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	647 @deftypefnx {} {} dbclear (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	648 @deftypefnx {} {} dbclear (\"@var{func}\", [@var{line1}, @dots{}])\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	649 @deftypefnx {} {} dbclear (@var{line}, @dots{})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	650 @deftypefnx {} {} dbclear (\"all\")\n\
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	651 Delete a breakpoint at line number @var{line} in the function @var{func}.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	652 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	653 Arguments are\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	654 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	655 @table @var\n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	656 @item func\n\
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	657 Function name as a string variable. When already in debug mode this argument\n\
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	658 can be omitted and the current function will be used.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10839 diff changeset	659 \n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	660 @item line\n\
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	661 Line number from which to remove a breakpoint. Multiple lines may be given\n\
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	662 as separate arguments or as a vector.\n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	663 @end table\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	664 \n\
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	665 When called without a line number specification all breakpoints in the named\n\
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	666 function are cleared.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	667 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	668 If the requested line is not a breakpoint no action is performed.\n\
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	669 \n\
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	670 The special keyword @qcode{\"all\"} will clear all breakpoints from all\n\
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	671 files.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	672 @seealso{dbstop, dbstatus, dbwhere}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	673 @end deftypefn")
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	674 {
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	675 octave_value retval;
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	676 std::string symbol_name = "";
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	677 bp_table::intmap lines;
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	678
7348 d1a97ad87264 [project @ 2008-01-04 21:49:15 by jwe] jwe parents: 7336 diff changeset	679 parse_dbfunction_params ("dbclear", args, symbol_name, lines);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	680
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	681 if (args.length () == 1 && symbol_name == "all")
18379 80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	682 bp_table::remove_all_breakpoints ();
80d39575fd44 Add new input keyword "all" for dbclear to remove all breakpoints. Rik <rik@octave.org> parents: 18377 diff changeset	683 else
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	684 bp_table::remove_breakpoint (symbol_name, lines);
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	685
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	686 return retval;
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	687 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	688
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	689 DEFUN (dbstatus, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	690 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	691 @deftypefn {} {} dbstatus ()\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	692 @deftypefnx {} {@var{brk_list} =} dbstatus ()\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	693 @deftypefnx {} {@var{brk_list} =} dbstatus (\"@var{func}\")\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	694 Report the location of active breakpoints.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	695 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	696 When called with no input or output arguments, print the list of all\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	697 functions with breakpoints and the line numbers where those breakpoints are\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	698 set.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	699 \n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	700 If a function name @var{func} is specified then only report breakpoints\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	701 for the named function.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	702 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	703 The optional return argument @var{brk_list} is a struct array with the\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	704 following fields.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	705 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	706 @table @asis\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	707 @item name\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	708 The name of the function with a breakpoint.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	709 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	710 @item file\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	711 The name of the m-file where the function code is located.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	712 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	713 @item line\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	714 A line number, or vector of line numbers, with a breakpoint.\n\
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	715 @end table\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	716 \n\
18377 7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	717 Note: When @code{dbstatus} is called from the debug prompt within a function,\n\
7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	718 the list of breakpoints is automatically trimmed to the breakpoints in the\n\
7cb745caaab5 Allow dbstop to set breakpoints outside of the function currently being debugged. Rik <rik@octave.org> parents: 18376 diff changeset	719 current function.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	720 @seealso{dbclear, dbwhere}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	721 @end deftypefn")
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	722 {
11058 3329616444f0 replace Octave_map in debug.cc and error.cc Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	723 octave_map retval;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	724 int nargin = args.length ();
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	725 octave_value_list fcn_list;
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	726 bp_table::fname_line_map bp_list;
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	727 std::string symbol_name;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	728
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	729 if (nargin != 0 && nargin != 1)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	730 error ("dbstatus: only zero or one arguments accepted\n");
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	731
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	732 if (nargin == 1)
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	733 {
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	734 if (args(0).is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	735 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	736 symbol_name = args(0).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	737 fcn_list(0) = symbol_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	738 bp_list = bp_table::get_breakpoint_list (fcn_list);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	739 }
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	740 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	741 gripe_wrong_type_arg ("dbstatus", args(0));
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	742 }
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	743 else
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	744 {
18376 bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	745 if (Vdebugging)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	746 {
18376 bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	747 octave_user_code *dbg_fcn = get_user_code ();
bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	748 if (dbg_fcn)
bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	749 {
bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	750 symbol_name = dbg_fcn->name ();
bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	751 fcn_list(0) = symbol_name;
bb162f81881d Correctly return all breakpoints when called with no arguments (bug #41338). Rik <rik@octave.org> parents: 18375 diff changeset	752 }
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	753 }
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	754
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	755 bp_list = bp_table::get_breakpoint_list (fcn_list);
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	756 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	757
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	758 if (nargout == 0)
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	759 {
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	760 // Print out the breakpoint information.
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	761
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	762 for (bp_table::fname_line_map_iterator it = bp_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	763 it != bp_list.end (); it++)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	764 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	765 bp_table::intmap m = it->second;
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	766
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	767 size_t nel = m.size ();
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	768
14228 0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	769 octave_stdout << "breakpoint in " << it->first;
0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	770 if (nel > 1)
0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	771 octave_stdout << " at lines ";
0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	772 else
0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	773 octave_stdout << " at line ";
0beb62668d69 Use correct plural for dbstatus if there is more than 1 breakpoint set in file. Rik <octave@nomad.inbox5.com> parents: 14227 diff changeset	774
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	775 for (size_t j = 0; j < nel; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	776 octave_stdout << m[j] << ((j < nel - 1) ? ", " : ".");
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	777
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	778 if (nel > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	779 octave_stdout << std::endl;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	780 }
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	781 return octave_value ();
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	782 }
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	783 else
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	784 {
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	785 // Fill in an array for return.
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	786
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	787 int i = 0;
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	788 Cell names (dim_vector (bp_list.size (), 1));
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	789 Cell file (dim_vector (bp_list.size (), 1));
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	790 Cell line (dim_vector (bp_list.size (), 1));
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	791
24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	792 for (bp_table::const_fname_line_map_iterator it = bp_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	793 it != bp_list.end (); it++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	794 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	795 names(i) = it->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	796 line(i) = intmap_to_ov (it->second);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	797 file(i) = do_which (it->first);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	798 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	799 }
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	800
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	801 retval.assign ("name", names);
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	802 retval.assign ("file", file);
ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	803 retval.assign ("line", line);
7083 24fde8abfb90 [project @ 2007-10-31 02:12:16 by jwe] jwe parents: 7082 diff changeset	804
7082 ac7179f00422 [project @ 2007-10-31 01:24:12 by jwe] jwe parents: 7017 diff changeset	805 return octave_value (retval);
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	806 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	807 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	808
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	809 DEFUN (dbwhere, , ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	810 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	811 @deftypefn {} {} dbwhere\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	812 In debugging mode, report the current file and line number where execution\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	813 is stopped.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	814 @seealso{dbstatus, dbcont, dbstep, dbup}\n\
5645 9c9bd01099ce [project @ 2006-03-06 22:33:54 by jwe] jwe parents: 5642 diff changeset	815 @end deftypefn")
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	816 {
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	817 octave_value retval;
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	818
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	819 octave_user_code *dbg_fcn = get_user_code ();
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	820
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	821 if (dbg_fcn)
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	822 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	823 bool have_file = true;
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	824
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	825 std::string name = dbg_fcn->fcn_file_name ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	826
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	827 if (name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	828 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	829 have_file = false;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	830
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	831 name = dbg_fcn->name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	832 }
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	833
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	834 octave_stdout << "stopped in " << name << " at ";
9484 bbe033dcfe13 make dbwhere work when called at keyboard prompt John W. Eaton <jwe@octave.org> parents: 9377 diff changeset	835
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	836 int l = octave_call_stack::caller_user_code_line ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	837
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	838 if (l > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	839 {
18375 e33f706468bc Fix extra space in dbwhere output. Rik <rik@octave.org> parents: 18374 diff changeset	840 octave_stdout << "line " << l << std::endl;
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	841
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	842 if (have_file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	843 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	844 std::string line = get_file_line (name, l);
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	845
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	846 if (! line.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	847 octave_stdout << l << ": " << line << std::endl;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	848 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	849 }
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	850 else
18375 e33f706468bc Fix extra space in dbwhere output. Rik <rik@octave.org> parents: 18374 diff changeset	851 octave_stdout << "<unknown line>" << std::endl;
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	852 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	853 else
14049 b5a8e245b4eb Change phrasing to more assertive error() messages in debug commands Rik <octave@nomad.inbox5.com> parents: 14035 diff changeset	854 error ("dbwhere: must be inside a user function to use dbwhere\n");
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	855
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	856 return retval;
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	857 }
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	858
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	859 void
3949 294f13627ee8 [project @ 2002-05-23 01:22:11 by jwe] jwe parents: 3948 diff changeset	860 do_dbtype (std::ostream& os, const std::string& name, int start, int end)
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	861 {
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	862 std::string ff = fcn_file_in_path (name);
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	863
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	864 if (! ff.empty ())
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	865 {
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	866 std::ifstream fs (ff.c_str (), std::ios::in);
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	867
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	868 if (fs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	869 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	870 int line = 1;
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19405 diff changeset	871 std::string text;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	872
18386 5b7b12e16523 Speed up dbtype by 10X by using line-oriented input. Rik <rik@octave.org> parents: 18380 diff changeset	873 while (std::getline (fs, text) && line <= end)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	874 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	875 if (line >= start)
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	876 os << line << "\t" << text << "\n";
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19405 diff changeset	877
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	878 line++;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	879 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	880 }
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	881 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	882 os << "dbtype: unable to open '" << ff << "' for reading!\n";
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	883 }
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	884 else
6317 8c67f8be341d [project @ 2007-02-16 08:10:53 by jwe] jwe parents: 5744 diff changeset	885 os << "dbtype: unknown function " << name << "\n";
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	886
6646 bd0a70c3f2db [project @ 2007-05-22 02:27:43 by jwe] jwe parents: 6317 diff changeset	887 os.flush ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	888 }
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	889
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	890 DEFUN (dbtype, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	891 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	892 @deftypefn {} {} dbtype\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	893 @deftypefnx {} {} dbtype @var{lineno}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	894 @deftypefnx {} {} dbtype @var{startl:endl}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	895 @deftypefnx {} {} dbtype @var{startl:end}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	896 @deftypefnx {} {} dbtype @var{func}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	897 @deftypefnx {} {} dbtype @var{func} @var{lineno}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	898 @deftypefnx {} {} dbtype @var{func} @var{startl:endl}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	899 @deftypefnx {} {} dbtype @var{func} @var{startl:end}\n\
15577 cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	900 Display a script file with line numbers.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	901 \n\
15577 cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	902 When called with no arguments in debugging mode, display the script file\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	903 currently being debugged.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	904 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	905 An optional range specification can be used to list only a portion of the\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	906 file. The special keyword @qcode{\"end\"} is a valid line number\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	907 specification for the last line of the file.\n\
15577 cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	908 \n\
cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	909 When called with the name of a function, list that script file with line\n\
cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	910 numbers.\n\
cef958fbae2d doc: Update docstring for dbtype(). Rik <rik@octave.org> parents: 15467 diff changeset	911 @seealso{dbwhere, dbstatus, dbstop}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	912 @end deftypefn")
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	913 {
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	914 octave_value retval;
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7539 diff changeset	915 octave_user_code *dbg_fcn;
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	916
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	917 string_vector argv = args.make_argv ("dbtype");
3946 eab957395758 [project @ 2002-05-23 00:42:15 by jwe] jwe parents: 3895 diff changeset	918
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	919 switch (args.length ())
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	920 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	921 case 0: // dbtype
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	922 dbg_fcn = get_user_code ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	923
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	924 if (dbg_fcn)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	925 do_dbtype (octave_stdout, dbg_fcn->fcn_file_name (),
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	926 0, std::numeric_limits<int>::max ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	927 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	928 error ("dbtype: must be inside a user function to give no arguments to dbtype\n");
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	929
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	930 break;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	931
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	932 case 1: // (dbtype start:end) \|\| (dbtype func) \|\| (dbtype lineno)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	933 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	934 std::string arg = argv[1];
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	935
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	936 size_t ind = arg.find (':');
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	937
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	938 if (ind != std::string::npos) // (dbtype start:end)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	939 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	940 dbg_fcn = get_user_code ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	941
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	942 if (dbg_fcn)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	943 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	944 std::string start_str = arg.substr (0, ind);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	945 std::string end_str = arg.substr (ind + 1);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	946
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	947 int start, end;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	948 start = atoi (start_str.c_str ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	949 if (end_str == "end")
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	950 end = std::numeric_limits<int>::max ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	951 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	952 end = atoi (end_str.c_str ());
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	953
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	954 if (std::min (start, end) <= 0)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	955 error ("dbtype: start and end lines must be >= 1\n");
18393 6a2cc29f55fc Correctly handle 'dbtype lineno' case. Rik <rik@octave.org> parents: 18392 diff changeset	956
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	957 if (start <= end)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	958 do_dbtype (octave_stdout, dbg_fcn->fcn_file_name (),
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	959 start, end);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	960 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	961 error ("dbtype: start line must be less than end line\n");
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	962 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	963 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	964 else // (dbtype func) \|\| (dbtype lineno)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	965 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	966 int line = atoi (arg.c_str ());
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	967
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	968 if (line == 0) // (dbtype func)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	969 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	970 dbg_fcn = get_user_code (arg);
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	971
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	972 if (dbg_fcn)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	973 do_dbtype (octave_stdout, dbg_fcn->fcn_file_name (),
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	974 0, std::numeric_limits<int>::max ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	975 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	976 error ("dbtype: function <%s> not found\n", arg.c_str ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	977 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	978 else // (dbtype lineno)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	979 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	980 if (line <= 0)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	981 error ("dbtype: start and end lines must be >= 1\n");
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	982
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	983 dbg_fcn = get_user_code ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	984
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	985 if (dbg_fcn)
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	986 do_dbtype (octave_stdout, dbg_fcn->fcn_file_name (),
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	987 line, line);
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	988 }
c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	989 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	990 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	991 break;
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	992
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	993 case 2: // (dbtype func start:end) \|\| (dbtype func start)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	994 dbg_fcn = get_user_code (argv[1]);
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	995
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	996 if (dbg_fcn)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	997 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	998 std::string arg = argv[2];
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	999 int start, end;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1000 size_t ind = arg.find (':');
6317 8c67f8be341d [project @ 2007-02-16 08:10:53 by jwe] jwe parents: 5744 diff changeset	1001
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1002 if (ind != std::string::npos)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1003 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1004 std::string start_str = arg.substr (0, ind);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1005 std::string end_str = arg.substr (ind + 1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1006
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1007 start = atoi (start_str.c_str ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1008 if (end_str == "end")
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1009 end = std::numeric_limits<int>::max ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1010 else
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1011 end = atoi (end_str.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1012 }
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1013 else
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1014 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1015 start = atoi (arg.c_str ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1016 end = start;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1017 }
14227 c24833c6ebc2 Add error messages to dbtype(). Allow use of "end" keyword in linespec. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1018
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1019 if (std::min (start, end) <= 0)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	1020 error ("dbtype: start and end lines must be >= 1\n");
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	1021
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1022 if (start <= end)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1023 do_dbtype (octave_stdout, dbg_fcn->fcn_file_name (),
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1024 start, end);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1025 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1026 error ("dbtype: start line must be less than end line\n");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1027 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1028 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1029 error ("dbtype: function <%s> not found\n", argv[1].c_str ());
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1030
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1031 break;
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1032
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1033 default:
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1034 error ("dbtype: expecting zero, one, or two arguments\n");
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3805 diff changeset	1035 }
3805 44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	1036
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	1037 return retval;
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	1038 }
44386b0e53da [project @ 2001-03-01 16:54:31 by jwe] jwe parents: diff changeset	1039
16842 035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1040 DEFUN (dblist, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1041 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1042 @deftypefn {} {} dblist\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1043 @deftypefnx {} {} dblist @var{n}\n\
16842 035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1044 In debugging mode, list @var{n} lines of the function being debugged\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1045 centered around the current line to be executed.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1046 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1047 If unspecified @var{n} defaults to 10 (+/- 5 lines)\n\
16842 035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1048 @seealso{dbwhere, dbtype}\n\
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1049 @end deftypefn")
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1050 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1051 octave_value retval;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1052
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1053 int n = 10;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1054
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1055 if (args.length () == 1)
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1056 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1057 octave_value arg = args(0);
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1058
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1059 if (arg.is_string ())
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1060 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1061 std::string s_arg = arg.string_value ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1062
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1063 n = atoi (s_arg.c_str ());
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1064 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1065 else
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1066 n = args(0).int_value ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1067
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1068 if (n < 0)
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1069 error ("dblist: N must be a non-negative integer");
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1070 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1071
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1072 octave_user_code *dbg_fcn = get_user_code ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1073
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1074 if (dbg_fcn)
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1075 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1076 bool have_file = true;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1077
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1078 std::string name = dbg_fcn->fcn_file_name ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1079
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1080 if (name.empty ())
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1081 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1082 have_file = false;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1083 name = dbg_fcn->name ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1084 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1085
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1086 int l = octave_call_stack::caller_user_code_line ();
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1087
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1088 if (l > 0)
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1089 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1090 if (have_file)
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1091 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1092 int l_min = std::max (l - n/2, 0);
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1093 int l_max = l + n/2;
18373 73f81a7509a2 Fix dblist problems when used in subfunctions. Rik <rik@octave.org> parents: 18236 diff changeset	1094 do_dbtype (octave_stdout, name, l_min, l-1);
16842 035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1095
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1096 std::string line = get_file_line (name, l);
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1097 if (! line.empty ())
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1098 octave_stdout << l << "-->\t" << line << std::endl;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1099
18373 73f81a7509a2 Fix dblist problems when used in subfunctions. Rik <rik@octave.org> parents: 18236 diff changeset	1100 do_dbtype (octave_stdout, name, l+1, l_max);
16842 035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1101 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1102 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1103 else
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1104 {
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1105 octave_stdout << "dblist: unable to determine source code line"
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1106 << std::endl;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1107 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1108 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1109 else
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1110 error ("dblist: must be inside a user function to use dblist\n");
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1111
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1112 return retval;
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1113 }
035b5fe157ad Add new dblist command to debugger (bug #38953) Rik <rik@octave.org> parents: 16771 diff changeset	1114
13689 b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1115 static octave_value_list
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1116 do_dbstack (const octave_value_list& args, int nargout, std::ostream& os)
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1117 {
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1118 int nargin = args.length ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1119
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1120 if (nargin > 2)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1121 print_usage ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1122
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1123 octave_value_list retval;
a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1124
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9724 diff changeset	1125 unwind_protect frame;
7890 73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1126
7901 3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7897 diff changeset	1127 octave_idx_type curr_frame = -1;
7890 73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1128
7901 3e4c9b69069d call stack changes John W. Eaton <jwe@octave.org> parents: 7897 diff changeset	1129 size_t nskip = 0;
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1130
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20804 diff changeset	1131 if (nargin == 1 \|\| nargin == 2)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1132 {
7890 73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1133 int n = 0;
73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1134
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20804 diff changeset	1135 for (octave_idx_type i = 0; i < nargin; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1136 {
17649 a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1137 octave_value arg = args(i);
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1138
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1139 if (arg.is_string ())
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1140 {
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1141 std::string s_arg = arg.string_value ();
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1142
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1143 // Skip "-completenames", octave returns full names anyway.
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1144
17649 a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1145 if (s_arg == "-completenames")
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1146 continue;
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1147
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1148 n = atoi (s_arg.c_str ());
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1149 }
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1150 else
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1151 n = arg.int_value ();
a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1152
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1153 if (n <= 0)
17649 a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1154 error ("dbstack: N must be a non-negative integer");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1155 }
7890 73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1156
73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1157 if (n > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1158 nskip = n;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1159 }
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1160
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1161 if (nargout == 0)
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1162 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1163 octave_map stk = octave_call_stack::backtrace (nskip, curr_frame);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1164 octave_idx_type nframes_to_display = stk.numel ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1165
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1166 if (nframes_to_display > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1167 {
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1168 octave_preserve_stream_state stream_state (os);
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1169
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1170 os << "stopped in:\n\n";
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1171
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1172 Cell names = stk.contents ("name");
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1173 Cell files = stk.contents ("file");
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1174 Cell lines = stk.contents ("line");
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	1175
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1176 bool show_top_level = true;
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	1177
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1178 size_t max_name_len = 0;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1179
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1180 for (octave_idx_type i = 0; i < nframes_to_display; i++)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1181 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1182 std::string name = names(i).string_value ();
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	1183
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1184 max_name_len = std::max (name.length (), max_name_len);
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1185 }
7890 73ef513855e7 dbstack fixes John W. Eaton <jwe@octave.org> parents: 7818 diff changeset	1186
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1187 for (octave_idx_type i = 0; i < nframes_to_display; i++)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1188 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1189 std::string name = names(i).string_value ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1190 std::string file = files(i).string_value ();
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1191 int line = lines(i).int_value ();
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	1192
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1193 if (show_top_level && i == curr_frame)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1194 show_top_level = false;
10839 65bc065bec95 still more debugger fixes John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	1195
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1196 os << (i == curr_frame ? " --> " : " ")
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1197 << std::setw (max_name_len) << name
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1198 << " at line " << line
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1199 << " [" << file << "]"
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1200 << std::endl;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1201 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1202
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1203 if (show_top_level)
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1204 os << " --> top level" << std::endl;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1205 }
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1206 }
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1207 else
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1208 {
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1209 octave_map stk = octave_call_stack::backtrace (nskip,
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1210 curr_frame,
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1211 false);
18440 96a495813047 Don't put parent function in subfunction stack structure name (bug #41506). Rik <rik@octave.org> parents: 18398 diff changeset	1212
20884 f1b2a2dbc0e1 2015 Code Sprint: use ovl () in C++ files. José Luis García Pallero <jgpallero@gmail.com> parents: 20853 diff changeset	1213 retval = ovl (stk,
f1b2a2dbc0e1 2015 Code Sprint: use ovl () in C++ files. José Luis García Pallero <jgpallero@gmail.com> parents: 20853 diff changeset	1214 curr_frame < 0 ? 1 : curr_frame + 1);
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1215 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1216
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1217 return retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1218 }
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1219
13326 23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1220 // A function that can be easily called from a debugger print the Octave
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1221 // stack. This can be useful for finding what line of code the
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1222 // interpreter is currently executing when the debugger is stopped in
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1223 // some C++ function, for example.
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1224
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13689 diff changeset	1225 void
13326 23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1226 show_octave_dbstack (void)
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1227 {
13689 b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1228 do_dbstack (octave_value_list (), 0, std::cerr);
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1229 }
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1230
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1231 DEFUN (dbstack, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1232 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1233 @deftypefn {} {} dbstack\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1234 @deftypefnx {} {} dbstack @var{n}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1235 @deftypefnx {} {} dbstack @var{-completenames}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1236 @deftypefnx {} {[@var{stack}, @var{idx}] =} dbstack (@dots{})\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1237 Display or return current debugging function stack information.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1238 \n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1239 With optional argument @var{n}, omit the @var{n} innermost stack frames.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1240 \n\
17649 a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1241 Although accepted, the argument @var{-completenames} is silently ignored.\n\
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20700 diff changeset	1242 Octave always returns absolute filenames.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1243 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1244 The arguments @var{n} and @var{-completenames} can be both specified in any\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1245 order.\n\
17649 a09511ebf7ef Make dbstack to accept -completenames. Michael Goffioul <michael.goffioul@gmail.com> parents: 17281 diff changeset	1246 \n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1247 The optional return argument @var{stack} is a struct array with the\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1248 following fields:\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1249 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1250 @table @asis\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1251 @item file\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1252 The name of the m-file where the function code is located.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1253 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1254 @item name\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1255 The name of the function with a breakpoint.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1256 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1257 @item line\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1258 The line number of an active breakpoint.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1259 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1260 @item column\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1261 The column number of the line where the breakpoint begins.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1262 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1263 @item scope\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1264 Undocumented.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1265 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1266 @item context\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1267 Undocumented.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1268 @end table\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1269 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1270 The return argument @var{idx} specifies which element of the @var{stack}\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1271 struct array is currently active.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1272 @seealso{dbup, dbdown, dbwhere, dbstatus}\n\
13689 b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1273 @end deftypefn")
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1274 {
b68d95054947 print show_octave_dbstack output to std::cerr John W. Eaton <jwe@octave.org> parents: 13326 diff changeset	1275 return do_dbstack (args, nargout, octave_stdout);
13326 23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1276 }
23cc9c13b622 show_octave_dbstack: new convenience function for debugging John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	1277
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1278 static void
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1279 do_dbupdown (const octave_value_list& args, const std::string& who)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1280 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1281 int n = 1;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1282
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1283 if (args.length () == 1)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1284 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1285 octave_value arg = args(0);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1286
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1287 if (arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1288 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1289 std::string s_arg = arg.string_value ();
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1290
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1291 n = atoi (s_arg.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1292 }
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1293 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1294 n = args(0).int_value ();
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1295 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1296
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1297 if (who == "dbup")
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1298 n = -n;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1299
20557 b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1300 if (! octave_call_stack::goto_frame_relative (n, true))
b10432a40432 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20428 diff changeset	1301 error ("%s: invalid stack frame", who.c_str ());
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1302 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1303
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1304 DEFUN (dbup, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1305 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1306 @deftypefn {} {} dbup\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1307 @deftypefnx {} {} dbup @var{n}\n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1308 In debugging mode, move up the execution stack @var{n} frames.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1309 \n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1310 If @var{n} is omitted, move up one frame.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1311 @seealso{dbstack, dbdown}\n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1312 @end deftypefn")
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1313 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1314 octave_value retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1315
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1316 do_dbupdown (args, "dbup");
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1317
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1318 return retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1319 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1320
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1321 DEFUN (dbdown, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1322 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1323 @deftypefn {} {} dbdown\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1324 @deftypefnx {} {} dbdown @var{n}\n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1325 In debugging mode, move down the execution stack @var{n} frames.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1326 \n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1327 If @var{n} is omitted, move down one frame.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1328 @seealso{dbstack, dbup}\n\
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1329 @end deftypefn")
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1330 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1331 octave_value retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1332
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	1333 do_dbupdown (args, "dbdown");
7736 a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1334
a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1335 return retval;
a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1336 }
a059b5679fbb implement dbstack John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1337
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1338 DEFUN (dbstep, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1339 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1340 @deftypefn {} {} dbstep\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1341 @deftypefnx {} {} dbstep @var{n}\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1342 @deftypefnx {} {} dbstep in\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1343 @deftypefnx {} {} dbstep out\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1344 @deftypefnx {} {} dbnext @dots{}\n\
9724 f22bbc5d56e9 Fix various incorrect usages of TeXinfo deffn and deftypefn macros Rik <rdrider0-list@yahoo.com> parents: 9484 diff changeset	1345 In debugging mode, execute the next @var{n} lines of code.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1346 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1347 If @var{n} is omitted, execute the next single line of code. If the next\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1348 line of code is itself defined in terms of an m-file remain in the existing\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1349 function.\n\
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1350 \n\
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1351 Using @code{dbstep in} will cause execution of the next line to step into\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1352 any m-files defined on the next line.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1353 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1354 Using @code{dbstep out} will cause execution to continue until the current\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1355 function returns.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1356 \n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1357 @code{dbnext} is an alias for @code{dbstep}.\n\
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1358 @seealso{dbcont, dbquit}\n\
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1359 @end deftypefn")
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1360 {
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1361 if (! Vdebugging)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1362 error ("dbstep: can only be called in debug mode");
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1363
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1364 int nargin = args.length ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1365
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1366 if (nargin > 1)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1367 print_usage ();
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1368
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1369 if (nargin == 1)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1370 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1371 std::string arg = args(0).xstring_value ("dbstep: input argument must be a string");
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1372
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1373 if (arg == "in")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1374 {
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1375 Vdebugging = false;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1376
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1377 tree_evaluator::dbstep_flag = -1;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1378 }
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1379 else if (arg == "out")
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1380 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1381 Vdebugging = false;
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20557 diff changeset	1382
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1383 tree_evaluator::dbstep_flag = -2;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1384 }
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1385 else
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1386 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1387 int n = atoi (arg.c_str ());
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1388
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1389 if (n > 0)
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20557 diff changeset	1390 {
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20557 diff changeset	1391 Vdebugging = false;
19743 67f2c76f9f4d Remove unnecessary checking of error_state after is_string validation. Rik <rik@octave.org> parents: 19697 diff changeset	1392
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1393 tree_evaluator::dbstep_flag = n;
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20557 diff changeset	1394 }
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20557 diff changeset	1395 else
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1396 error ("dbstep: invalid argument");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1397 }
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1398 }
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1399 else
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1400 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1401 Vdebugging = false;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1402
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1403 tree_evaluator::dbstep_flag = 1;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1404 }
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1405
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1406 return octave_value_list ();
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1407 }
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1408
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	1409 DEFALIAS (dbnext, dbstep);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	1410
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1411 DEFUN (dbcont, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1412 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1413 @deftypefn {} {} dbcont\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1414 Leave command-line debugging mode and continue code execution normally.\n\
9724 f22bbc5d56e9 Fix various incorrect usages of TeXinfo deffn and deftypefn macros Rik <rdrider0-list@yahoo.com> parents: 9484 diff changeset	1415 @seealso{dbstep, dbquit}\n\
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1416 @end deftypefn")
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1417 {
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1418 if (! Vdebugging)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1419 error ("dbcont: can only be called in debug mode");
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	1420
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1421 if (args.length () != 0)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1422 print_usage ();
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1423
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1424 Vdebugging = false;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1425
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1426 tree_evaluator::reset_debug_state ();
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1427
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1428 return octave_value_list ();
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1429 }
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1430
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1431 DEFUN (dbquit, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1432 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1433 @deftypefn {} {} dbquit\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1434 Quit debugging mode immediately without further code execution and return to\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1435 the Octave prompt.\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1436 @seealso{dbcont, dbstep}\n\
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1437 @end deftypefn")
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1438 {
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1439 if (! Vdebugging)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1440 error ("dbquit: can only be called in debug mode");
10186 095a1e670e68 make dbstep work with keyboard function John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1441
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1442 if (args.length () != 0)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1443 print_usage ();
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8365 diff changeset	1444
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1445 Vdebugging = false;
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1446
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1447 tree_evaluator::reset_debug_state ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1448
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1449 octave_throw_interrupt_exception ();
7787 6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1450
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1451 return octave_value_list ();
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1452 }
6b521b1e3631 Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input David Bateman <dbateman@free.fr> parents: 7752 diff changeset	1453
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8677 diff changeset	1454 DEFUN (isdebugmode, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17753 diff changeset	1455 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1456 @deftypefn {} {} isdebugmode ()\n\
14035 3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1457 Return true if in debugging mode, otherwise false.\n\
3889c3eecaf0 doc: Update docstrings for dbXXX functions Rik <octave@nomad.inbox5.com> parents: 13983 diff changeset	1458 @seealso{dbwhere, dbstack, dbstatus}\n\
8114 cbbea37b95e8 debug.cc (Fisdebugmode): New function. Krzesimir Nowak <qdlacz@gmail.com> parents: 8021 diff changeset	1459 @end deftypefn")
cbbea37b95e8 debug.cc (Fisdebugmode): New function. Krzesimir Nowak <qdlacz@gmail.com> parents: 8021 diff changeset	1460 {
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1461 if (args.length () != 0)
8114 cbbea37b95e8 debug.cc (Fisdebugmode): New function. Krzesimir Nowak <qdlacz@gmail.com> parents: 8021 diff changeset	1462 print_usage ();
cbbea37b95e8 debug.cc (Fisdebugmode): New function. Krzesimir Nowak <qdlacz@gmail.com> parents: 8021 diff changeset	1463
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1464 return octave_value (Vdebugging);
8114 cbbea37b95e8 debug.cc (Fisdebugmode): New function. Krzesimir Nowak <qdlacz@gmail.com> parents: 8021 diff changeset	1465 }
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1466
19855 a59c5a16c9ab Rename db_next_breakpoint_quiet to internal function. Rik <rik@octave.org> parents: 19743 diff changeset	1467 DEFUN (__db_next_breakpoint_quiet__, args, ,
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1468 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1469 @deftypefn {} {} __db_next_breakpoint_quiet__ ()\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20831 diff changeset	1470 @deftypefnx {} {} __db_next_breakpoint_quiet__ (@var{flag})\n\
19855 a59c5a16c9ab Rename db_next_breakpoint_quiet to internal function. Rik <rik@octave.org> parents: 19743 diff changeset	1471 Disable line info printing at the next breakpoint.\n\
a59c5a16c9ab Rename db_next_breakpoint_quiet to internal function. Rik <rik@octave.org> parents: 19743 diff changeset	1472 \n\
a59c5a16c9ab Rename db_next_breakpoint_quiet to internal function. Rik <rik@octave.org> parents: 19743 diff changeset	1473 With a logical argument @var{flag}, set the state on or off.\n\
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1474 @end deftypefn")
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1475 {
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1476 int nargin = args.length ();
c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1477
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1478 if (nargin > 1)
a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1479 print_usage ();
a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1480
a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1481 bool state = true;
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1482
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1483 if (nargin == 1)
a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1484 state = args(0).bool_value ();
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1485
20804 a6eaedd8bd75 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20713 diff changeset	1486 tree_evaluator::quiet_breakpoint_flag = state;
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1487
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1488 return octave_value_list ();
19379 c1ce43276b86 avoid printing debug location in cmd window when using GUI to step John W. Eaton <jwe@octave.org> parents: 18236 diff changeset	1489 }
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20884 diff changeset	1490

Mercurial > octave

annotate libinterp/corefcn/debug.cc @ 20918:6f0bd96f93c0