octave-nkf: liboctave/Array.cc comparison

[project @ 2006-09-15 20:29:18 by jwe]

comparison

equal deleted inserted replaced

-:265723390e7b
+:4289ed95dde8
 return retval;
 }
 template <class T>
 Array<T>
-Array<T>::index (Array<idx_vector>& ra_idx, int resize_ok, const T&) const
+Array<T>::index (Array<idx_vector>& ra_idx, int resize_ok, const T& rfv) const
 {
 // This function handles all calls with more than one idx.
 // For (3x3x3), the call can be A(2,5), A(2,:,:), A(3,2,3) etc.
 Array<T> retval;
 if (iidx.capacity () == 1 && trim_trailing_singletons)
 	ra_idx_len--;
 else
 	trim_trailing_singletons = false;
-for (octave_idx_type i = 0; i < iidx.capacity (); i++)
+if (! resize_ok)
-	if (iidx (i) != 0)
+	{
-	  {
+	  for (octave_idx_type i = 0; i < iidx.capacity (); i++)
-	    (*current_liboctave_error_handler)
+	    if (iidx (i) != 0)
-	      ("index exceeds N-d array dimensions");
+	      {
+		(*current_liboctave_error_handler)
-	    return retval;
+		  ("index exceeds N-d array dimensions");
-	  }
+		return retval;
+	      }
+	}
 }
 ra_idx.resize (ra_idx_len);
 dim_vector new_dims = dims ();
 	    {
 	      elt_idx = get_elt_idx (ra_idx, result_idx);
 	      octave_idx_type numelem_elt = get_scalar_idx (elt_idx, new_dims);
-	      if (numelem_elt > length () || numelem_elt < 0)
+	      if (numelem_elt >= length () || numelem_elt < 0)
-		(*current_liboctave_error_handler)
+		retval.elem (i) = rfv;
-		  ("invalid N-d array index");
 	      else
 		retval.elem (i) = elem (numelem_elt);
 	      increment_index (result_idx, frozen_lengths);

Mercurial > octave-nkf