# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1631097979 14400
# Node ID 2dca5c25237d35ae0c99dd06be802d3a3bb95058
# Parent  14214fbfa25816ceedb9ffda86cbb2c1ed72e465
undo matrix -> m_matrix changes in type names and error messages

Files affected: ov-base-diag.cc, ov-cx-diag.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, and ov-re-diag.cc.

diff -r 14214fbfa258 -r 2dca5c25237d libinterp/octave-value/ov-base-diag.cc
--- a/libinterp/octave-value/ov-base-diag.cc	Tue Sep 07 21:05:27 2021 -0700
+++ b/libinterp/octave-value/ov-base-diag.cc	Wed Sep 08 06:46:19 2021 -0400
@@ -309,7 +309,7 @@
 
   if (helper_iscomplex (el_type ()) && ! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              "complex m_matrix", "real scalar");
+                              "complex matrix", "real scalar");
 
   if (isempty ())
     err_invalid_conversion (type_name (), "real scalar");
@@ -328,7 +328,7 @@
 
   if (helper_iscomplex (el_type ()) && ! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              "complex m_matrix", "real scalar");
+                              "complex matrix", "real scalar");
 
   if (! (numel () > 0))
     err_invalid_conversion (type_name (), "real scalar");
@@ -517,7 +517,7 @@
   is >> tmp;
 
   if (! is)
-    error ("load: failed to load diagonal m_matrix constant");
+    error ("load: failed to load diagonal matrix constant");
 
   // This is a little tricky, as we have the Matrix type, but
   // not ColumnVector type.  We need to help the compiler get
diff -r 14214fbfa258 -r 2dca5c25237d libinterp/octave-value/ov-cx-diag.cc
--- a/libinterp/octave-value/ov-cx-diag.cc	Tue Sep 07 21:05:27 2021 -0700
+++ b/libinterp/octave-value/ov-cx-diag.cc	Wed Sep 08 06:46:19 2021 -0400
@@ -41,7 +41,7 @@
 template class octave_base_diag<ComplexDiagMatrix, ComplexMatrix>;
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex_diag_matrix,
-                                     "complex diagonal m_matrix", "double");
+                                     "complex diagonal matrix", "double");
 
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
@@ -108,7 +108,7 @@
 
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              type_name (), "real m_matrix");
+                              type_name (), "real matrix");
 
   retval = ::real (m_matrix);
 
@@ -122,7 +122,7 @@
 
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              type_name (), "real m_matrix");
+                              type_name (), "real matrix");
 
   retval = ::real (m_matrix);
 
diff -r 14214fbfa258 -r 2dca5c25237d libinterp/octave-value/ov-flt-cx-diag.cc
--- a/libinterp/octave-value/ov-flt-cx-diag.cc	Tue Sep 07 21:05:27 2021 -0700
+++ b/libinterp/octave-value/ov-flt-cx-diag.cc	Wed Sep 08 06:46:19 2021 -0400
@@ -40,7 +40,7 @@
 template class octave_base_diag<FloatComplexDiagMatrix, FloatComplexMatrix>;
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex_diag_matrix,
-                                     "float complex diagonal m_matrix", "single");
+                                     "float complex diagonal matrix", "single");
 
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
@@ -88,7 +88,7 @@
 
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              type_name (), "real m_matrix");
+                              type_name (), "real matrix");
 
   retval = ::real (m_matrix);
 
@@ -102,7 +102,7 @@
 
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
-                              type_name (), "real m_matrix");
+                              type_name (), "real matrix");
 
   retval = ::real (m_matrix);
 
diff -r 14214fbfa258 -r 2dca5c25237d libinterp/octave-value/ov-flt-re-diag.cc
--- a/libinterp/octave-value/ov-flt-re-diag.cc	Tue Sep 07 21:05:27 2021 -0700
+++ b/libinterp/octave-value/ov-flt-re-diag.cc	Wed Sep 08 06:46:19 2021 -0400
@@ -39,7 +39,7 @@
 template class octave_base_diag<FloatDiagMatrix, FloatMatrix>;
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_diag_matrix,
-                                     "float diagonal m_matrix", "single");
+                                     "float diagonal matrix", "single");
 
 static octave_base_value *
 default_numeric_conversion_function (const octave_base_value& a)
diff -r 14214fbfa258 -r 2dca5c25237d libinterp/octave-value/ov-re-diag.cc
--- a/libinterp/octave-value/ov-re-diag.cc	Tue Sep 07 21:05:27 2021 -0700
+++ b/libinterp/octave-value/ov-re-diag.cc	Wed Sep 08 06:46:19 2021 -0400
@@ -39,7 +39,7 @@
 
 template class octave_base_diag<DiagMatrix, Matrix>;
 
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_diag_matrix, "diagonal m_matrix",
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_diag_matrix, "diagonal matrix",
                                      "double");
 
 static octave_base_value *