Mercurial > octave

changeset 33452:418932096146 bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge default to bytecode-interpreter
author John W. Eaton <jwe@octave.org>
date Wed, 24 Apr 2024 13:13:37 -0400
parents 662938d6b684 (current diff) 35ecb8a019e3 (diff)
children 6993450e2f71
files
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-classdef.cc	Tue Apr 23 15:32:22 2024 -0400
+++ b/libinterp/octave-value/ov-classdef.cc	Wed Apr 24 13:13:37 2024 -0400
@@ -395,16 +395,17 @@
             os << "  " << nm;
           else
             {
+              os << std::setw (max_len+2) << nm << ": ";
+
               octave_value val = prop.get_value (m_object, false);
-              const dim_vector& dims = val.dims ();
 
-              os << std::setw (max_len+2) << nm << ": ";
-              if (val.is_string ())
-                os << val.string_value ();
-              else if (val.islogical ())
-                os << val.bool_value ();
+              if (val.ndims () == 2 && val.rows () == 1 && (val.isnumeric () || val.islogical () || val.is_string ()))
+                val.short_disp (os);
               else
-                os << "[" << dims.str () << " " << val.class_name () << "]";
+                {
+                  dim_vector dims = val.dims ();
+                  os << "[" << dims.str () << " " << val.class_name () << "]";
+                }
             }
 
           newline (os);