# HG changeset patch
# User Julien Bect <address@hidden>
# Date 1472417922 -7200
#      Sun Aug 28 22:58:42 2016 +0200
# Node ID abd2bb1364b90481c583c3b7753e6ea0e33b48c7
# Parent  5b9f2502b1dd098bf83992fbda0fc65077df9611
Remove unnecessary initializations in float_value and double_value methods

 * ov-base-diag.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-ch-mat.cc,
   ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-flt-complex.cc,
   ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc:
   Remove unnecessary initializations and declarations in float_value and
   double_value methods.

diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-base-diag.cc
--- a/libinterp/octave-value/ov-base-diag.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-base-diag.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -300,7 +300,6 @@
 double
 octave_base_diag<DMT, MT>::double_value (bool force_conversion) const
 {
-  double retval = lo_ieee_nan_value ();
   typedef typename DMT::element_type el_type;
 
   if (helper_iscomplex (el_type ()) && ! force_conversion)
@@ -313,33 +312,26 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                             type_name (), "real scalar");
 
-  retval = helper_getreal (el_type (matrix (0, 0)));
-
-  return retval;
+  return helper_getreal (el_type (matrix (0, 0)));
 }
 
 template <typename DMT, typename MT>
 float
 octave_base_diag<DMT, MT>::float_value (bool force_conversion) const
 {
-  float retval = lo_ieee_float_nan_value ();
   typedef typename DMT::element_type el_type;
 
   if (helper_iscomplex (el_type ()) && ! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex matrix", "real scalar");
 
-  if (numel () > 0)
-    {
-      warn_implicit_conversion ("Octave:array-to-scalar",
-                                type_name (), "real scalar");
-
-      retval = helper_getreal (el_type (matrix (0, 0)));
-    }
-  else
+  if (! (numel () > 0))
     err_invalid_conversion (type_name (), "real scalar");
 
-  return retval;
+  warn_implicit_conversion ("Octave:array-to-scalar",
+                            type_name (), "real scalar");
+
+  return helper_getreal (el_type (matrix (0, 0)));
 }
 
 template <typename DMT, typename MT>
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-bool-mat.cc
--- a/libinterp/octave-value/ov-bool-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-bool-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -104,33 +104,25 @@
 double
 octave_bool_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (rows () == 0 || columns () == 0)
     err_invalid_conversion ("bool matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "bool matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 float
 octave_bool_matrix::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (rows () == 0 || columns () == 0)
     err_invalid_conversion ("bool matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "bool matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 Complex
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-bool-sparse.cc
--- a/libinterp/octave-value/ov-bool-sparse.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-bool-sparse.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -99,8 +99,6 @@
 double
 octave_sparse_bool_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("bool sparse matrix", "real scalar");
 
@@ -108,9 +106,7 @@
     warn_implicit_conversion ("Octave:array-to-scalar",
                               "bool sparse matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 Complex
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-ch-mat.cc
--- a/libinterp/octave-value/ov-ch-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-ch-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -65,33 +65,25 @@
 double
 octave_char_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (rows () == 0 || columns () == 0)
     err_invalid_conversion ("character matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "character matrix", "real scalar");
 
-  retval = static_cast<unsigned char> (matrix(0, 0));
-
-  return retval;
+  return static_cast<unsigned char> (matrix(0, 0));
 }
 
 float
 octave_char_matrix::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (rows () == 0 && columns () == 0)
     err_invalid_conversion ("character matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "character matrix", "real scalar");
 
-  retval = static_cast<unsigned char> (matrix(0, 0));
-
-  return retval;
+  return static_cast<unsigned char> (matrix(0, 0));
 }
 
 octave_int64
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-complex.cc
--- a/libinterp/octave-value/ov-complex.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-complex.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -148,29 +148,21 @@
 double
 octave_complex::double_value (bool force_conversion) const
 {
-  double retval;
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex scalar", "real scalar");
 
-  retval = scalar.real ();
-
-  return retval;
+  return scalar.real ();
 }
 
 float
 octave_complex::float_value (bool force_conversion) const
 {
-  float retval;
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex scalar", "real scalar");
 
-  retval = scalar.real ();
-
-  return retval;
+  return scalar.real ();
 }
 
 Matrix
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-cx-mat.cc
--- a/libinterp/octave-value/ov-cx-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-cx-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -105,8 +105,6 @@
 double
 octave_complex_matrix::double_value (bool force_conversion) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                                "complex matrix", "real scalar");
@@ -117,16 +115,12 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                              "complex matrix", "real scalar");
 
-  retval = octave::math::real (matrix(0, 0));
-
-  return retval;
+  return octave::math::real (matrix(0, 0));
 }
 
 float
 octave_complex_matrix::float_value (bool force_conversion) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                                "complex matrix", "real scalar");
@@ -137,9 +131,7 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                              "complex matrix", "real scalar");
 
-  retval = octave::math::real (matrix(0, 0));
-
-  return retval;
+  return octave::math::real (matrix(0, 0));
 }
 
 NDArray
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-cx-sparse.cc
--- a/libinterp/octave-value/ov-cx-sparse.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -106,8 +106,6 @@
 double
 octave_sparse_complex_matrix::double_value (bool force_conversion) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex sparse matrix", "real scalar");
@@ -120,9 +118,7 @@
     warn_implicit_conversion ("Octave:array-to-scalar",
                               "complex sparse matrix", "real scalar");
 
-  retval = octave::math::real (matrix(0, 0));
-
-  return retval;
+  return octave::math::real (matrix(0, 0));
 }
 
 Matrix
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-flt-complex.cc
--- a/libinterp/octave-value/ov-flt-complex.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-flt-complex.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -94,29 +94,21 @@
 double
 octave_float_complex::double_value (bool force_conversion) const
 {
-  double retval;
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex scalar", "real scalar");
 
-  retval = scalar.real ();
-
-  return retval;
+  return scalar.real ();
 }
 
 float
 octave_float_complex::float_value (bool force_conversion) const
 {
-  float retval;
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex scalar", "real scalar");
 
-  retval = scalar.real ();
-
-  return retval;
+  return scalar.real ();
 }
 
 Matrix
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-flt-cx-mat.cc
--- a/libinterp/octave-value/ov-flt-cx-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-flt-cx-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -93,8 +93,6 @@
 double
 octave_float_complex_matrix::double_value (bool force_conversion) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex matrix", "real scalar");
@@ -105,16 +103,12 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "complex matrix", "real scalar");
 
-  retval = octave::math::real (matrix(0, 0));
-
-  return retval;
+  return octave::math::real (matrix(0, 0));
 }
 
 float
 octave_float_complex_matrix::float_value (bool force_conversion) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (! force_conversion)
     warn_implicit_conversion ("Octave:imag-to-real",
                               "complex matrix", "real scalar");
@@ -125,9 +119,7 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "complex matrix", "real scalar");
 
-  retval = octave::math::real (matrix(0, 0));
-
-  return retval;
+  return octave::math::real (matrix(0, 0));
 }
 
 Matrix
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-flt-re-mat.cc
--- a/libinterp/octave-value/ov-flt-re-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -99,33 +99,25 @@
 double
 octave_float_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("real matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "real matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 float
 octave_float_matrix::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("real matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "real matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 // FIXME
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-perm.cc
--- a/libinterp/octave-value/ov-perm.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-perm.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -148,33 +148,25 @@
 double
 octave_perm_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion (type_name (), "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             type_name (), "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 float
 octave_perm_matrix::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion (type_name (), "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             type_name (), "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 Complex
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-range.cc
--- a/libinterp/octave-value/ov-range.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-range.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -190,8 +190,6 @@
 double
 octave_range::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   octave_idx_type nel = range.numel ();
 
   if (nel == 0)
@@ -200,16 +198,12 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "range", "real scalar");
 
-  retval = range.base ();
-
-  return retval;
+  return range.base ();
 }
 
 float
 octave_range::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   octave_idx_type nel = range.numel ();
 
   if (nel == 0)
@@ -218,9 +212,7 @@
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "range", "real scalar");
 
-  retval = range.base ();
-
-  return retval;
+  return range.base ();
 }
 
 charNDArray
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-re-mat.cc
--- a/libinterp/octave-value/ov-re-mat.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-re-mat.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -114,33 +114,25 @@
 double
 octave_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("real matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "real matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 float
 octave_matrix::float_value (bool) const
 {
-  float retval = lo_ieee_float_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("real matrix", "real scalar");
 
   warn_implicit_conversion ("Octave:array-to-scalar",
                             "real matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 // FIXME
diff -r 5b9f2502b1dd -r abd2bb1364b9 libinterp/octave-value/ov-re-sparse.cc
--- a/libinterp/octave-value/ov-re-sparse.cc	Fri Aug 26 20:13:06 2016 +0200
+++ b/libinterp/octave-value/ov-re-sparse.cc	Sun Aug 28 22:58:42 2016 +0200
@@ -95,8 +95,6 @@
 double
 octave_sparse_matrix::double_value (bool) const
 {
-  double retval = lo_ieee_nan_value ();
-
   if (is_empty ())
     err_invalid_conversion ("real sparse matrix", "real scalar");
 
@@ -104,9 +102,7 @@
     warn_implicit_conversion ("Octave:array-to-scalar",
                               "real sparse matrix", "real scalar");
 
-  retval = matrix(0, 0);
-
-  return retval;
+  return matrix(0, 0);
 }
 
 Complex