octave: libinterp/corefcn/debug.cc annotate

annotate libinterp/corefcn/debug.cc @ 18375:e33f706468bc

Fix extra space in dbwhere output. * debug.cc (Fdbwhere): Remove extra space between "at" and "line".

author	Rik <rik@octave.org>
date	Fri, 24 Jan 2014 12:28:33 -0800
parents	12eb4eb90486
children	bb162f81881d

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

Mercurial > octave

annotate libinterp/corefcn/debug.cc @ 18375:e33f706468bc