X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/ff810079188b8d04224959d5b54254d3e142d6c3..refs/heads/wip:/libguile/generalized-vectors.c

diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c
index 2d437a475..fc493bc80 100644
--- a/libguile/generalized-vectors.c
+++ b/libguile/generalized-vectors.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+ *   2005, 2006, 2009, 2010, 2011, 2012, 2013, 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
  * as published by the Free Software Foundation; either version 3 of
@@ -62,7 +63,7 @@ SCM_DEFINE (scm_make_generalized_vector, "make-generalized-vector", 2, 1, 0,
 {
   int i;
   for (i = 0; i < num_vector_ctors_registered; i++)
-    if (vector_ctors[i].tag == type)
+    if (scm_is_eq (vector_ctors[i].tag, type))
       return vector_ctors[i].ctor(len, fill);
   scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, type, "array type");
 }
@@ -82,16 +83,6 @@ scm_is_generalized_vector (SCM obj)
   return ret;
 }
 
-SCM_DEFINE (scm_generalized_vector_p, "generalized-vector?", 1, 0, 0,
-	    (SCM obj),
-	    "Return @code{#t} if @var{obj} is a vector, string,\n"
-	    "bitvector, or uniform numeric vector.")
-#define FUNC_NAME s_scm_generalized_vector_p
-{
-  return scm_from_bool (scm_is_generalized_vector (obj));
-}
-#undef FUNC_NAME
-
 #define SCM_VALIDATE_VECTOR_WITH_HANDLE(pos, val, handle)   \
   scm_generalized_vector_get_handle (val, handle)
    
@@ -110,83 +101,20 @@ scm_generalized_vector_get_handle (SCM vec, scm_t_array_handle *h)
 size_t
 scm_c_generalized_vector_length (SCM v)
 {
-  scm_t_array_handle h;
-  size_t ret;
-  scm_generalized_vector_get_handle (v, &h);
-  ret = h.dims[0].ubnd - h.dims[0].lbnd + 1;
-  scm_array_handle_release (&h);
-  return ret;
-}
-
-SCM_DEFINE (scm_generalized_vector_length, "generalized-vector-length", 1, 0, 0,
-	    (SCM v),
-	    "Return the length of the generalized vector @var{v}.")
-#define FUNC_NAME s_scm_generalized_vector_length
-{
-  return scm_from_size_t (scm_c_generalized_vector_length (v));
+  return scm_c_array_length (v);
 }
-#undef FUNC_NAME
 
 SCM
-scm_c_generalized_vector_ref (SCM v, size_t idx)
-{
-  scm_t_array_handle h;
-  SCM ret;
-  scm_generalized_vector_get_handle (v, &h);
-  ret = h.impl->vref (&h, idx);
-  scm_array_handle_release (&h);
-  return ret;
-}
-
-SCM_DEFINE (scm_generalized_vector_ref, "generalized-vector-ref", 2, 0, 0,
-	    (SCM v, SCM idx),
-	    "Return the element at index @var{idx} of the\n"
-	    "generalized vector @var{v}.")
-#define FUNC_NAME s_scm_generalized_vector_ref
+scm_c_generalized_vector_ref (SCM v, ssize_t idx)
 {
-  return scm_c_generalized_vector_ref (v, scm_to_size_t (idx));
+  return scm_c_array_ref_1 (v, idx);
 }
-#undef FUNC_NAME
 
 void
-scm_c_generalized_vector_set_x (SCM v, size_t idx, SCM val)
-{
-  scm_t_array_handle h;
-  scm_generalized_vector_get_handle (v, &h);
-  h.impl->vset (&h, idx, val);
-  scm_array_handle_release (&h);
-}
-
-SCM_DEFINE (scm_generalized_vector_set_x, "generalized-vector-set!", 3, 0, 0,
-	    (SCM v, SCM idx, SCM val),
-	    "Set the element at index @var{idx} of the\n"
-	    "generalized vector @var{v} to @var{val}.")
-#define FUNC_NAME s_scm_generalized_vector_set_x
+scm_c_generalized_vector_set_x (SCM v, ssize_t idx, SCM val)
 {
-  scm_c_generalized_vector_set_x (v, scm_to_size_t (idx), val);
-  return SCM_UNSPECIFIED;
+  scm_c_array_set_1_x (v, val, idx);
 }
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_generalized_vector_to_list, "generalized-vector->list", 1, 0, 0,
-	    (SCM v),
-	    "Return a new list whose elements are the elements of the\n"
-	    "generalized vector @var{v}.")
-#define FUNC_NAME s_scm_generalized_vector_to_list
-{
-  SCM ret = SCM_EOL;
-  ssize_t pos, i = 0;
-  scm_t_array_handle h;
-  scm_generalized_vector_get_handle (v, &h);
-  // FIXME CHECKME
-  for (pos = h.dims[0].ubnd, i = (h.dims[0].ubnd - h.dims[0].lbnd + 1);
-       i >= 0;
-       pos += h.dims[0].inc)
-    ret = scm_cons (h.impl->vref (&h, pos), ret);
-  scm_array_handle_release (&h);
-  return ret;
-}
-#undef FUNC_NAME
 
 void
 scm_init_generalized_vectors ()