Mercurial > jwe > octave

diff libinterp/parse-tree/pt-idx.cc @ 21118:3ac9f47fb04b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invert pattern if/code/else/err_XXX to if !/err_XXX/code. * daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, load-save.cc, lsode.cc, quad.cc, xnorm.cc, xpow.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc, ov.cc, pt-idx.cc, Array-util.cc, Array.cc, Sparse.cc, lo-specfun.cc, mx-inlines.cc, oct-binmap.h: Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:08:30 -0800
parents e39e05d90788
children 499b851fbfae
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-idx.cc	Wed Jan 20 15:45:58 2016 -0800
+++ b/libinterp/parse-tree/pt-idx.cc	Wed Jan 20 16:08:30 2016 -0800
@@ -182,8 +182,8 @@
     {
       if (rvalue && object && args->has_magic_end () && object->is_undefined ())
         err_invalid_inquiry_subscript ();
-      else
-        retval = args->convert_to_const_vector (object);
+
+      retval = args->convert_to_const_vector (object);
     }
 
   octave_idx_type n = retval.length ();
@@ -534,8 +534,8 @@
               {
                 if (tidx.has_magic_colon ())
                   err_invalid_inquiry_subscript ();
-                else
-                  tmp = Cell ();
+
+                tmp = Cell ();
               }
             else if (tmp.is_zero_by_zero ()
                      && (tmp.is_matrix_type () || tmp.is_string ()))
@@ -569,8 +569,8 @@
                   {
                     if (pidx.has_magic_colon ())
                       err_invalid_inquiry_subscript ();
-                    else
-                      tmp = octave_map ();
+
+                    tmp = octave_map ();
                   }
                 else if (autoconv)
                   tmp = octave_map ();