Mercurial > octave

changeset 20966:7026da637999

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: utils.cc: invert if/else/error instances. * utils.cc: invert if/else/error instances.
author Doug Stewart <doug.dastew@gmail.com
date Tue, 22 Dec 2015 21:46:07 -0500
parents 93a48264f402
children 3a9b33590516
files libinterp/corefcn/utils.cc
diffstat 1 files changed, 12 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/utils.cc	Tue Dec 22 23:28:38 2015 -0500
+++ b/libinterp/corefcn/utils.cc	Tue Dec 22 21:46:07 2015 -0500
@@ -1145,17 +1145,14 @@
       octave_idx_type nr = a.rows ();
       octave_idx_type nc = a.columns ();
 
-      if (nr == 1 || nc == 1)
-        {
-          Array<double> v = a.vector_value ();
+      if (nr != 1 && nc != 1)
+        error ("%s (A): use %s (size (A)) instead", warn_for, warn_for);
 
-          octave_idx_type n = v.numel ();
-          dim.resize (n);
-          for (octave_idx_type i = 0; i < n; i++)
-            dim(i) = static_cast<int> (fix (v(i)));
-        }
-      else
-        error ("%s (A): use %s (size (A)) instead", warn_for, warn_for);
+      Array<double> v = a.vector_value ();
+      octave_idx_type n = v.numel ();
+      dim.resize (n);
+      for (octave_idx_type i = 0; i < n; i++)
+        dim(i) = static_cast<int> (fix (v(i)));
     }
 
   check_dimensions (dim, warn_for);
@@ -1175,16 +1172,12 @@
       nr = a.rows ();
       nc = a.columns ();
 
-      if ((nr == 1 && nc == 2) || (nr == 2 && nc == 1))
-        {
-          Array<double> v = a.vector_value ();
-
+      if ((nr != 1 || nc != 2) && (nr != 2 || nc != 1))
+        error ("%s (A): use %s (size (A)) instead", warn_for, warn_for);
 
-          nr = static_cast<octave_idx_type> (fix (v (0)));
-          nc = static_cast<octave_idx_type> (fix (v (1)));
-        }
-      else
-        error ("%s (A): use %s (size (A)) instead", warn_for, warn_for);
+      Array<double> v = a.vector_value ();
+      nr = static_cast<octave_idx_type> (fix (v(0)));
+      nc = static_cast<octave_idx_type> (fix (v(1)));
     }
 
   check_dimensions (nr, nc, warn_for);