Merge commit '24cac65540'

Conflicts:
	libguile/vectors.c

libguile/sort.c

@@ -1,5 +1,5 @@
 /* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
- *   2010, 2011, 2012 Free Software Foundation, Inc.
+ *   2010, 2011, 2012, 2014 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -377,12 +377,13 @@ SCM_DEFINE (scm_sort_x, "sort!", 2, 0, 0,
       SCM_VALIDATE_LIST_COPYLEN (1, items, len);
       return scm_merge_list_step (&items, less, len);
     }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+           || (scm_is_array (items) && scm_c_array_rank (items) == 1))
     {
       scm_restricted_vector_sort_x (items,
 				    less,
 				    scm_from_int (0),
-				    scm_vector_length (items));
+				    scm_array_length (items));
       return items;
     }
   else
@@ -403,7 +404,8 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
 
   if (scm_is_pair (items))
     return scm_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+           || (scm_is_array (items) && scm_c_array_rank (items) == 1))
     return scm_sort_x (scm_vector_copy (items), less);
   else
     SCM_WRONG_TYPE_ARG (1, items);
@@ -489,7 +491,8 @@ SCM_DEFINE (scm_stable_sort_x, "stable-sort!", 2, 0, 0,
       SCM_VALIDATE_LIST_COPYLEN (1, items, len);
       return scm_merge_list_step (&items, less, len);
     }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+           || (scm_is_array (items) && scm_c_array_rank (items) == 1))
     {
       scm_t_array_handle temp_handle, vec_handle;
       SCM temp, *temp_elts, *vec_elts;
@@ -532,7 +535,8 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
 
   if (scm_is_pair (items))
     return scm_stable_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+           || (scm_is_array (items) && scm_c_array_rank (items) == 1))
     return scm_stable_sort_x (scm_vector_copy (items), less);
   else
     SCM_WRONG_TYPE_ARG (1, items);

libguile/vectors.c

@@ -46,20 +46,13 @@
 int
 scm_is_vector (SCM obj)
 {
-  if (SCM_I_IS_VECTOR (obj))
+  return SCM_I_IS_NONWEAK_VECTOR (obj);
-    return 1;
-  if  (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
-    {
-      SCM v = SCM_I_ARRAY_V (obj);
-      return SCM_I_IS_VECTOR (v);
-    }
-  return 0;
 }
 
 int
 scm_is_simple_vector (SCM obj)
 {
-  return SCM_I_IS_VECTOR (obj);
+  return SCM_I_IS_NONWEAK_VECTOR (obj);
 }
 
 const SCM *
@@ -111,29 +104,19 @@ SCM_DEFINE (scm_vector_length, "vector-length", 1, 0, 0,
             "Returns the number of elements in @var{vector} as an exact integer.")
 #define FUNC_NAME s_scm_vector_length
 {
-  if (SCM_I_IS_NONWEAK_VECTOR (v))
+  return scm_from_size_t (scm_c_vector_length (v));
-    return scm_from_size_t (SCM_I_VECTOR_LENGTH (v));
-  else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
-    {
-      scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
-      return scm_from_size_t (dim->ubnd - dim->lbnd + 1);
-    }
-  else
-    {
-      scm_wrong_type_arg_msg ("vector-length", 1, v, "vector");
-      return SCM_UNDEFINED;  /* not reached */
-    }
 }
 #undef FUNC_NAME
 
 size_t
 scm_c_vector_length (SCM v)
+#define FUNC_NAME s_scm_vector_length
 {
-  if (SCM_I_IS_NONWEAK_VECTOR (v))
+  SCM_VALIDATE_VECTOR (1, v);
+
   return SCM_I_VECTOR_LENGTH (v);
-  else
-    return scm_to_size_t (scm_vector_length (v));
 }
+#undef FUNC_NAME
 
 SCM_REGISTER_PROC (s_list_to_vector, "list->vector", 1, 0, 0, scm_vector);
 /*
@@ -199,33 +182,16 @@ SCM_DEFINE (scm_vector_ref, "vector-ref", 2, 0, 0,
 
 SCM
 scm_c_vector_ref (SCM v, size_t k)
+#define FUNC_NAME s_scm_vector_ref
 {
-  if (SCM_I_IS_NONWEAK_VECTOR (v))
+  SCM_VALIDATE_VECTOR (1, v);
-    {
+
   if (k >= SCM_I_VECTOR_LENGTH (v))
     scm_out_of_range (NULL, scm_from_size_t (k));
+
   return SCM_SIMPLE_VECTOR_REF (v, k);
-    }
-  else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
-    {
-      scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
-      SCM vv = SCM_I_ARRAY_V (v);
-
-      k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
-      if (k >= dim->ubnd - dim->lbnd + 1)
-        scm_out_of_range (NULL, scm_from_size_t (k));
-
-      if (SCM_I_IS_NONWEAK_VECTOR (vv))
-        return SCM_SIMPLE_VECTOR_REF (vv, k);
-      else
-        scm_wrong_type_arg_msg (NULL, 0, v, "non-uniform vector");
-    }
-  else
-    {
-      scm_wrong_type_arg_msg ("vector-ref", 1, v, "vector");
-      return SCM_UNDEFINED;  /* not reached */
-    }
 }
+#undef FUNC_NAME
 
 SCM_DEFINE (scm_vector_set_x, "vector-set!", 3, 0, 0, 
 	    (SCM vector, SCM k, SCM obj),
@@ -247,30 +213,16 @@ SCM_DEFINE (scm_vector_set_x, "vector-set!", 3, 0, 0,
 
 void
 scm_c_vector_set_x (SCM v, size_t k, SCM obj)
+#define FUNC_NAME s_scm_vector_set_x
 {
-  if (SCM_I_IS_NONWEAK_VECTOR (v))
+  SCM_VALIDATE_VECTOR (1, v);
-    {
+
   if (k >= SCM_I_VECTOR_LENGTH (v))
     scm_out_of_range (NULL, scm_from_size_t (k)); 
+
   SCM_SIMPLE_VECTOR_SET (v, k, obj);
-    }
-  else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
-    {
-      scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
-      SCM vv = SCM_I_ARRAY_V (v);
-
-      k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
-      if (k >= dim->ubnd - dim->lbnd + 1)
-        scm_out_of_range (NULL, scm_from_size_t (k));
-
-      if (SCM_I_IS_NONWEAK_VECTOR (vv))
-        SCM_SIMPLE_VECTOR_SET (vv, k, obj);
-      else
-	scm_wrong_type_arg_msg (NULL, 0, v, "non-uniform vector");
-    }
-  else
-    scm_wrong_type_arg_msg ("vector-set!", 1, v, "vector");
 }
+#undef FUNC_NAME
 
 SCM_DEFINE (scm_make_vector, "make-vector", 1, 1, 0,
             (SCM k, SCM fill),