# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1632367062 14400
# Node ID 75fb18f0469a4b21dc83f7da41f74d6bd5f38a73
# Parent  c2c11605fa7aa37fab4e23a9d0191e6f3e860507
fix file position info for errors in conditional expressions (bug #61201)

* pt-eval.cc (tree_evaluator::is_logically_true): Set file position
in call stack for expression before evaluating it.
(tree_evaluator::visit_do_until_command): Don't set file position in
call stack here.
* bug-61201.tst: New file.
* test/module.mk: Update

diff -r c2c11605fa7a -r 75fb18f0469a libinterp/parse-tree/pt-eval.cc
--- a/libinterp/parse-tree/pt-eval.cc	Wed Sep 22 23:13:36 2021 -0400
+++ b/libinterp/parse-tree/pt-eval.cc	Wed Sep 22 23:17:42 2021 -0400
@@ -4189,8 +4189,6 @@
     unwind_protect_var<bool> upv (m_in_loop_command, true);
 
     tree_expression *expr = cmd.condition ();
-    int until_line = cmd.line ();
-    int until_column = cmd.column ();
 
     if (! expr)
       panic_impossible ();
@@ -4211,8 +4209,6 @@
         if (m_debug_mode)
           do_breakpoint (cmd.is_active_breakpoint (*this));
 
-        m_call_stack.set_location (until_line, until_column);
-
         if (is_logically_true (expr, "do-until"))
           break;
       }
@@ -4351,6 +4347,8 @@
   {
     bool expr_value = false;
 
+    m_call_stack.set_location (expr->line (), expr->column ());
+
     octave_value t1 = expr->evaluate (*this);
 
     if (t1.is_defined ())
diff -r c2c11605fa7a -r 75fb18f0469a test/bug-61201.tst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/bug-61201.tst	Wed Sep 22 23:17:42 2021 -0400
@@ -0,0 +1,64 @@
+########################################################################
+##
+## Copyright (C) 2010-2021 The Octave Project Developers
+##
+## See the file COPYRIGHT.md in the top-level directory of this
+## distribution or <https://octave.org/copyright/>.
+##
+## This file is part of Octave.
+##
+## Octave is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## Octave is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
+##
+########################################################################
+
+%!function lineno = test_conditional_lines (type)
+%!  lineno = -42;
+%!  warning ("error", "Octave:possible-matlab-short-circuit-operator", "local");
+%!  try
+%!    switch (type)
+%!      case "while"
+%!        k = 0;
+%!        while (k < 2 & true)  ## line 8
+%!          k++;
+%!        endwhile
+%!      case "until"
+%!        k = 0;
+%!        do
+%!          k++;
+%!        until (k > 2 & true);  ## line 15, but see below...
+%!      case "if"
+%!        k = 2;
+%!        if (k < 2 & true)  ## line 18
+%!        endif
+%!      case "elseif"
+%!        k = 2;
+%!        if (false)
+%!        elseif (k < 2 & true)  ## line 23
+%!        endif
+%!    endswitch
+%!  catch (ex)
+%!    lineno = ex.stack(1).line;
+%!  end_try_catch
+%!endfunction
+
+%!assert<61201> (test_conditional_lines ("while"), 8)
+
+%!assert<61201> (test_conditional_lines ("if"), 18)
+
+%!assert<61201> (test_conditional_lines ("elseif"), 23)
+
+## Because the DO-UNTIL statement is not part of Matlab it is not
+## eligible for Matlab-style short-circuit behavior in Octave.
+%!assert<61201> (test_conditional_lines ("until"), -42)
diff -r c2c11605fa7a -r 75fb18f0469a test/module.mk
--- a/test/module.mk	Wed Sep 22 23:13:36 2021 -0400
+++ b/test/module.mk	Wed Sep 22 23:17:42 2021 -0400
@@ -20,6 +20,7 @@
   %reldir%/bug-55321.tst \
   %reldir%/bug-55322.tst \
   %reldir%/bug-59950.tst \
+  %reldir%/bug-61201.tst \
   %reldir%/colormaps.tst \
   %reldir%/command.tst \
   %reldir%/complex.tst \