Mercurial > hg > octave-max
changeset 14227:c24833c6ebc2
Add error messages to dbtype(). Allow use of "end" keyword in linespec.
* debug.cc (dbtype): Add error messages when function not found.
Allow use of "end" keyword in linespec. Add new features to docstring.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Wed, 18 Jan 2012 21:17:14 -0800 |
| parents | d580d7179f85 |
| children | 0beb62668d69 |
| files | src/debug.cc |
| diffstat | 1 files changed, 46 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/debug.cc +++ b/src/debug.cc @@ -792,11 +792,15 @@ "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} dbtype ()\n\ @deftypefnx {Loadable Function} {} dbtype (\"startl:endl\")\n\ +@deftypefnx {Loadable Function} {} dbtype (\"startl:end\")\n\ @deftypefnx {Loadable Function} {} dbtype (\"@var{func}\")\n\ +@deftypefnx {Loadable Function} {} dbtype (\"@var{func}\", \"startl\")\n\ @deftypefnx {Loadable Function} {} dbtype (\"@var{func}\", \"startl:endl\")\n\ +@deftypefnx {Loadable Function} {} dbtype (\"@var{func}\", \"startl:end\")\n\ When in debugging mode and called with no arguments, list the script file\n\ being debugged with line numbers. An optional range specification,\n\ specified as a string, can be used to list only a portion of the file.\n\ +The special keyword \"end\" is a valid line number specification.\n\ \n\ When called with the name of a function, list that script file\n\ with line numbers.\n\ @@ -823,40 +827,46 @@ break; case 1: // (dbtype func) || (dbtype start:end) - dbg_fcn = get_user_code (argv[1]); + { + std::string arg = argv[1]; + + size_t ind = arg.find (':'); - if (dbg_fcn) - do_dbtype (octave_stdout, dbg_fcn->name (), 0, INT_MAX); - else - { - dbg_fcn = get_user_code (); + if (ind != std::string::npos) // (dbtype start:end) + { + dbg_fcn = get_user_code (); - if (dbg_fcn) - { - std::string arg = argv[1]; - - size_t ind = arg.find (':'); + if (dbg_fcn) + { + std::string start_str = arg.substr (0, ind); + std::string end_str = arg.substr (ind + 1); - if (ind != std::string::npos) - { - std::string start_str = arg.substr (0, ind); - std::string end_str = arg.substr (ind + 1); + int start, end; + start = atoi (start_str.c_str ()); + if (end_str == "end") + end = INT_MAX; + else + end = atoi (end_str.c_str ()); - int start = atoi (start_str.c_str ()); - int end = atoi (end_str.c_str ()); + if (std::min (start, end) <= 0) + error ("dbtype: start and end lines must be >= 1\n"); - if (std::min (start, end) <= 0) - error ("dbtype: start and end lines must be >= 1\n"); + if (start <= end) + do_dbtype (octave_stdout, dbg_fcn->name (), start, end); + else + error ("dbtype: start line must be less than end line\n"); + } + } + else // (dbtype func) + { + dbg_fcn = get_user_code (arg); - if (start <= end) - do_dbtype (octave_stdout, dbg_fcn->name (), start, end); - else - error ("dbtype: start line must be less than end line\n"); - } - else - error ("dbtype: line specification must be `start:end'"); - } - } + if (dbg_fcn) + do_dbtype (octave_stdout, dbg_fcn->name (), 0, INT_MAX); + else + error ("dbtype: function <%s> not found\n", arg.c_str ()); + } + } break; case 2: // (dbtype func start:end) , (dbtype func start) @@ -865,8 +875,7 @@ if (dbg_fcn) { std::string arg = argv[2]; - int start = 0; - int end = 0; + int start, end; size_t ind = arg.find (':'); if (ind != std::string::npos) @@ -875,8 +884,10 @@ std::string end_str = arg.substr (ind + 1); start = atoi (start_str.c_str ()); - end = atoi (end_str.c_str ()); - + if (end_str == "end") + end = INT_MAX; + else + end = atoi (end_str.c_str ()); } else { @@ -892,6 +903,9 @@ else error ("dbtype: start line must be less than end line\n"); } + else + error ("dbtype: function <%s> not found\n", argv[1].c_str ()); + break; default: