Mercurial > octave
changeset 31912:e1a3ebecc4f0
maint: merge stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 20 Mar 2023 12:57:34 -0400 |
| parents | 685937390083 (current diff) cdde21868c2d (diff) |
| children | 01ae7ebc6a13 |
| files | libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp libinterp/parse-tree/pt-binop.cc |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Sat Mar 18 15:37:12 2023 -0400 +++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Mon Mar 20 12:57:34 2023 -0400 @@ -794,7 +794,7 @@ */ void Vt102Emulation::reportCursorPosition() -{ char tmp[20]; +{ char tmp[32]; sprintf(tmp,"\033[%d;%dR",_currentScreen->getCursorY()+1,_currentScreen->getCursorX()+1); sendString(tmp); }
--- a/libinterp/parse-tree/pt-binop.cc Sat Mar 18 15:37:12 2023 -0400 +++ b/libinterp/parse-tree/pt-binop.cc Mon Mar 20 12:57:34 2023 -0400 @@ -156,6 +156,8 @@ return octave_value (result); } + else + return tree_binary_expression::evaluate (tw); } return octave_value ();
--- a/test/if.tst Sat Mar 18 15:37:12 2023 -0400 +++ b/test/if.tst Mon Mar 20 12:57:34 2023 -0400 @@ -48,6 +48,14 @@ %! endif %! assert (__prog_output_assert__ ("pass")); +%!test <63935> +%! if (true (4, 1) & true (4, 1)) +%! __printf_assert__ ("pass\n"); +%! elseif (x) +%! __printf_assert__ ("fail\n"); +%! endif +%! assert (__prog_output_assert__ ("pass")); + %!test %! x = 0; %! y = -2;