Mercurial > octave

diff libinterp/corefcn/oct-map.cc @ 20982:d27f66b4b8e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: invert if/else/error instances. * oct-map.cc, oct-stream.cc, sparse-xpow.cc, symtab.h, typecast.cc, urlwrite.cc: Invert if/else/error instances.
author John W. Eaton <jwe@octave.org>
date Fri, 25 Dec 2015 00:48:01 -0500
parents 3aa293be0e8d
children 538b57866b90
line wrap: on
line diff
--- a/libinterp/corefcn/oct-map.cc	Fri Dec 25 00:36:19 2015 -0500
+++ b/libinterp/corefcn/oct-map.cc	Fri Dec 25 00:48:01 2015 -0500
@@ -265,16 +265,14 @@
   if (nfields () == 0)
     dimensions = val.dims ();
 
-  if (val.dims () == dimensions)
-    {
-      octave_idx_type idx = xkeys.getfield (k);
-      if (idx < static_cast<octave_idx_type> (xvals.size ()))
-        xvals[idx] = val;
-      else
-        xvals.push_back (val);
-    }
+  if (val.dims () != dimensions)
+    error ("octave_map::setfield: internal error");
+
+  octave_idx_type idx = xkeys.getfield (k);
+  if (idx < static_cast<octave_idx_type> (xvals.size ()))
+    xvals[idx] = val;
   else
-    error ("octave_map::setfield: internal error");
+    xvals.push_back (val);
 }
 
 void