Mercurial > octave

diff libinterp/operators/op-scm-sm.cc @ 26596:cc0d942d0e20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). * libinterp/corefcn/errwarn.h (warn_divide_by_zero), libinterp/corefcn/errwarn.cc (warn_divide_by_zero): Deprecate function "warn_divide_by_zero", and leave implementation empty for a few releases. * libinterp/corefcn/error.cc: Use different id for test. * examples/code/make_int.cc: No longer advertise "warn_divide_by_zero" in the examples. * libinterp/operators/op-*-*.cc: Remove unused header "errwarn.h". Remove check for scalar zero divisor including the warning. * libinterp/operators/op-dms-template.cc (gripe_if_zero): Remove function. * scripts/general/quadgk.m, scripts/general/quadv.m, scripts/statistics/kurtosis.m, scripts/statistics/mean.m, scripts/statistics/skewness.m: No longer need to turn off unused warning. * scripts/help/warning_ids.m: Remove documentation of "Octave:divide-by-zero". * test/jit.tst, test/mk-sparse-tst.sh, test/prefer.tst: Remove warning "Octave:divide-by-zero".
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Tue, 22 Jan 2019 14:34:08 +0100
parents 00f796120a6d
children b442ec6dda5c
line wrap: on
line diff
--- a/libinterp/operators/op-scm-sm.cc	Tue Jan 22 08:07:55 2019 -0500
+++ b/libinterp/operators/op-scm-sm.cc	Tue Jan 22 14:34:08 2019 +0100
@@ -25,7 +25,6 @@
 #  include "config.h"
 #endif
 
-#include "errwarn.h"
 #include "ovl.h"
 #include "ov.h"
 #include "ov-typeinfo.h"
@@ -53,14 +52,7 @@
     = dynamic_cast<const octave_sparse_matrix&> (a2);
 
   if (v2.rows () == 1 && v2.columns () == 1)
-    {
-      double d = v2.scalar_value ();
-
-      if (d == 0.0)
-        warn_divide_by_zero ();
-
-      return octave_value (v1.sparse_complex_matrix_value () / d);
-    }
+    return octave_value (v1.sparse_complex_matrix_value () / v2.scalar_value ());
   else
     {
       MatrixType typ = v2.matrix_type ();
@@ -85,14 +77,7 @@
     = dynamic_cast<const octave_sparse_matrix&> (a2);
 
   if (v1.rows () == 1 && v1.columns () == 1)
-    {
-      Complex d = v1.complex_value ();
-
-      if (d == 0.0)
-        warn_divide_by_zero ();
-
-      return octave_value (v2.sparse_matrix_value () / d);
-    }
+    return octave_value (v2.sparse_matrix_value () / v1.complex_value ());
   else
     {
       MatrixType typ = v1.matrix_type ();