Mercurial > hg > octave-nkf

diff src/ov-str-mat.cc @ 5539:b800ae36fc6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-11-16 18:45:32 by jwe]
author jwe
date Wed, 16 Nov 2005 18:45:32 +0000
parents 66ad03c58880
children 6286c96121c2
line wrap: on
line diff
--- a/src/ov-str-mat.cc
+++ b/src/ov-str-mat.cc
@@ -90,15 +90,8 @@
 
   switch (len)
     {
-    case 2:
-      {
-	idx_vector i = idx (0).index_vector ();
-	idx_vector j = idx (1).index_vector ();
-
-	if (! error_state)
-	  retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)),
-				 true, type);
-      }
+    case 0:
+      retval = octave_value (matrix, true, type);
       break;
 
     case 1:
@@ -111,8 +104,15 @@
       }
       break;
 
-    case 0:
-      error ("invalid number of indices (= 0) for %d-dimensional character array", matrix.ndims ());
+    case 2:
+      {
+	idx_vector i = idx (0).index_vector ();
+	idx_vector j = idx (1).index_vector ();
+
+	if (! error_state)
+	  retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)),
+				 true, type);
+      }
       break;
 
     default: