octave: libinterp/corefcn/debug.cc annotate

annotate libinterp/corefcn/debug.cc @ 20925:667861ffffab

Extracted header class octave-preserve-stream-state from utils.{cc/h}. * libinterp/corefcn/octave-preserve-stream-state.h: extracted class definition. * libinterp/corefcn/module.mk: add octave-preserve-stream-state.h to build system. * libinterp/corefcn/utils.{cc/h}: extracted code of class octave-preserve-stream-state. * libinterp/corefcn/debug.cc: add new header dependency. * libinterp/corefcn/pr-output.cc: add new header dependency. * libinterp/corefcn/variables.cc: add new header dependency. * libinterp/corefcn/ov-base-sparse.cc: add new header dependency.

author	Kai T. Ohlhus <k.ohlhus@gmail.com>
date	Thu, 17 Dec 2015 16:19:51 +0100
parents	6f0bd96f93c0
children	48b2ad5ee801

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

Mercurial > octave

annotate libinterp/corefcn/debug.cc @ 20925:667861ffffab