Mercurial > octave-nkf
changeset 18511:83f5f2d41486 gui-release
correctly handle nested evalin ('caller', ...) calls at top scope (bug #41651)
* toplev.cc (octave_call_stack::do_goto_caller_frame): Compare scope of
current stack element to scope of the top of the call stack instead of
checking whether the current frame is 0.
| author | Michael C. Grant <mcg@cvxr.com> |
|---|---|
| date | Fri, 21 Feb 2014 08:05:37 -0600 |
| parents | 9831d6b4c5a7 |
| children | d28c4c4547ef |
| files | libinterp/corefcn/toplev.cc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/toplev.cc Fri Feb 21 14:58:30 2014 -0500 +++ b/libinterp/corefcn/toplev.cc Fri Feb 21 08:05:37 2014 -0600 @@ -469,7 +469,7 @@ octave_function *f = elt.fcn; - if (frame == 0 || (f && f->is_user_code ())) + if (elt.scope == cs[0].scope || (f && f->is_user_code ())) { if (! skipped) // We found the current user code frame, so skip it.