Mercurial > octave-nkf

diff libinterp/corefcn/oct-map.cc @ 20590:1a0a433c8263

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * dirfns.cc, oct-map.cc, oct-stream.cc, regexp.cc, ov-base-mat.cc, ov-cell.cc, pt-idx.cc, pt-mat.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 21:13:12 -0400
parents dd6345fd8a97
children
line wrap: on
line diff
--- a/libinterp/corefcn/oct-map.cc	Mon Oct 05 20:37:19 2015 -0400
+++ b/libinterp/corefcn/oct-map.cc	Mon Oct 05 21:13:12 2015 -0400
@@ -914,8 +914,7 @@
           {
             idx_vector i = idx(0).index_vector ();
 
-            if (! error_state)
-              retval = index (i, resize_ok);
+            retval = index (i, resize_ok);
           }
           break;
 
@@ -923,13 +922,10 @@
           {
             idx_vector i = idx(0).index_vector ();
 
-            if (! error_state)
-              {
-                k = 1;
-                idx_vector j = idx(1).index_vector ();
+            k = 1;
+            idx_vector j = idx(1).index_vector ();
 
-                retval = index (i, j, resize_ok);
-              }
+            retval = index (i, j, resize_ok);
           }
           break;
 
@@ -938,15 +934,9 @@
             Array<idx_vector> ia (dim_vector (n_idx, 1));
 
             for (k = 0; k < n_idx; k++)
-              {
-                ia(k) = idx(k).index_vector ();
+              ia(k) = idx(k).index_vector ();
 
-                if (error_state)
-                  break;
-              }
-
-            if (! error_state)
-              retval = index (ia, resize_ok);
+            retval = index (ia, resize_ok);
           }
           break;
         }
@@ -1124,8 +1114,7 @@
           {
             idx_vector i = idx(0).index_vector ();
 
-            if (! error_state)
-              assign (i, rhs);
+            assign (i, rhs);
           }
           break;
 
@@ -1133,13 +1122,10 @@
           {
             idx_vector i = idx(0).index_vector ();
 
-            if (! error_state)
-              {
-                k = 1;
-                idx_vector j = idx(1).index_vector ();
+            k = 1;
+            idx_vector j = idx(1).index_vector ();
 
-                assign (i, j, rhs);
-              }
+            assign (i, j, rhs);
           }
           break;
 
@@ -1148,15 +1134,9 @@
             Array<idx_vector> ia (dim_vector (n_idx, 1));
 
             for (k = 0; k < n_idx; k++)
-              {
-                ia(k) = idx(k).index_vector ();
+              ia(k) = idx(k).index_vector ();
 
-                if (error_state)
-                  break;
-              }
-
-            if (! error_state)
-              assign (ia, rhs);
+            assign (ia, rhs);
           }
           break;
         }
@@ -1182,7 +1162,7 @@
 
   ref.assign (idx, rhs);
 
-  if (! error_state && ref.dims () != dimensions)
+  if (ref.dims () != dimensions)
     {
       dimensions = ref.dims ();
 
@@ -1196,7 +1176,7 @@
       optimize_dimensions ();
     }
 
-  if (! error_state && &ref == &tmp)
+  if (&ref == &tmp)
     setfield (k, tmp);
 }
 
@@ -1286,13 +1266,9 @@
           e.set_pos_if_unset (n_idx, i+1);
           throw;
         }
-
-      if (error_state)
-        break;
     }
 
-  if (! error_state)
-    delete_elements (ia);
+  delete_elements (ia);
 }
 
 /*