# HG changeset patch # User Markus Mützel # Date 1713979558 -7200 # Wed Apr 24 19:25:58 2024 +0200 # Node ID 5048eedd095d9eaea8456561fc3d8c3c17becff8 # Parent cbc028c1d50b068e5a59ddf3ad44f1cc745e340d Show ellipsis at end of long arrays for short_disp (bug #65637). * ov-base-diag.cc (octave_base_diag::short_disp), ov-base-mat.cc (octave_base_matrix::short_disp), ov-perm.cc (octave_perm_matrix::short_disp): Append ellipsis if number of displayed elements is truncated. diff -r cbc028c1d50b -r 5048eedd095d libinterp/octave-value/ov-base-diag.cc --- a/libinterp/octave-value/ov-base-diag.cc Sat Apr 20 13:13:50 2024 +0200 +++ b/libinterp/octave-value/ov-base-diag.cc Wed Apr 24 19:25:58 2024 +0200 @@ -619,7 +619,11 @@ os << tmp[0]; if (++elts >= max_elts) - goto done; + { + if (i < nr - 1 || j < nc - 1) + os << "..."; + goto done; + } if (j < nc - 1) os << ", "; diff -r cbc028c1d50b -r 5048eedd095d libinterp/octave-value/ov-base-mat.cc --- a/libinterp/octave-value/ov-base-mat.cc Sat Apr 20 13:13:50 2024 +0200 +++ b/libinterp/octave-value/ov-base-mat.cc Wed Apr 24 19:25:58 2024 +0200 @@ -32,7 +32,6 @@ #include "Array-util.h" -#include "Cell.h" #include "errwarn.h" #include "ovl.h" #include "oct-map.h" @@ -532,7 +531,11 @@ os << tmp[0]; if (++elts >= max_elts) - goto done; + { + if (i < nr - 1 || j < nc - 1) + os << "..."; + goto done; + } if (j < nc - 1) os << ", "; diff -r cbc028c1d50b -r 5048eedd095d libinterp/octave-value/ov-perm.cc --- a/libinterp/octave-value/ov-perm.cc Sat Apr 20 13:13:50 2024 +0200 +++ b/libinterp/octave-value/ov-perm.cc Wed Apr 24 19:25:58 2024 +0200 @@ -532,7 +532,11 @@ os << tmp[0]; if (++elts >= max_elts) - goto done; + { + if (i < nr - 1 || j < nc - 1) + os << "..."; + goto done; + } if (j < nc - 1) os << ", ";