Add a missing SYNC_ALL in variable-ref

[bpt/guile.git] / libguile / uniform.c

diff --git a/libguile/uniform.c b/libguile/uniform.c
index 28125da..d3ecb1b 100644 (file)
--- a/libguile/uniform.c
+++ b/libguile/uniform.c
@@ -1,4 +1,4 @@
-/* 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 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
@@ -23,8 +23,6 @@
 #  include <config.h>
 #endif
 
-#include <assert.h>
-
 #include "libguile/_scm.h"
 #include "libguile/__scm.h"
 
@@ -44,13 +42,24 @@ const size_t scm_i_array_element_type_sizes[SCM_ARRAY_ELEMENT_TYPE_LAST + 1] = {
   64, 128
 };
 
-/* FIXME: return bit size instead of byte size? */
 size_t
 scm_array_handle_uniform_element_size (scm_t_array_handle *h)
 {
   size_t ret = scm_i_array_element_type_sizes[h->element_type];
   if (ret && ret % 8 == 0)
     return ret / 8;
+  else if (ret)
+    scm_wrong_type_arg_msg (NULL, 0, h->array, "byte-aligned uniform array");
+  else
+    scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
+}
+
+size_t
+scm_array_handle_uniform_element_bit_size (scm_t_array_handle *h)
+{
+  size_t ret = scm_i_array_element_type_sizes[h->element_type];
+  if (ret)
+    return ret;
   else
     scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
 }
@@ -90,13 +99,11 @@ scm_is_uniform_vector (SCM obj)
 size_t
 scm_c_uniform_vector_length (SCM uvec)
 {
-  scm_t_array_handle h;
-  size_t len;
-  ssize_t inc;
-  
-  scm_uniform_vector_elements (uvec, &h, &len, &inc);
-  scm_array_handle_release (&h);
-  return len;
+  if (!scm_is_uniform_vector (uvec))
+    scm_wrong_type_arg_msg ("uniform-vector-length", 1, uvec,
+                            "uniform vector");
+
+  return scm_c_generalized_vector_length (uvec);
 }
 
 SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0, 0,
@@ -110,14 +117,15 @@ SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0, 0,
 
 SCM_DEFINE (scm_uniform_vector_element_type, "uniform-vector-element-type", 1, 0, 0,
            (SCM v),
-           "Return the number of elements in the uniform vector, @var{v}.")
+           "Return the type of the elements in the uniform vector, @var{v}.")
 #define FUNC_NAME s_scm_uniform_vector_element_type
 {
   scm_t_array_handle h;
-  size_t len;
-  ssize_t inc;
   SCM ret;
-  scm_uniform_vector_elements (v, &h, &len, &inc);
+  
+  if (!scm_is_uniform_vector (v))
+    scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, v, "uniform vector");
+  scm_array_get_handle (v, &h);
   ret = scm_array_handle_element_type (&h);
   scm_array_handle_release (&h);
   return ret;
@@ -144,21 +152,15 @@ SCM_DEFINE (scm_uniform_vector_element_size, "uniform-vector-element-size", 1, 0
 SCM
 scm_c_uniform_vector_ref (SCM v, size_t idx)
 {
-  SCM ret;
-  scm_t_array_handle h;
-  size_t len;
-  ssize_t inc;
-  
-  scm_uniform_vector_elements (v, &h, &len, &inc);
-  ret = scm_array_handle_ref (&h, idx*inc);
-  scm_array_handle_release (&h);
-  return ret;
+  if (!scm_is_uniform_vector (v))
+    scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
+  return scm_c_generalized_vector_ref (v, idx);
 }
 
 SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
            (SCM v, SCM idx),
            "Return the element at index @var{idx} of the\n"
-           "homogenous numeric vector @var{v}.")
+           "homogeneous numeric vector @var{v}.")
 #define FUNC_NAME s_scm_uniform_vector_ref
 {
   return scm_c_uniform_vector_ref (v, scm_to_size_t (idx));
@@ -168,19 +170,15 @@ SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
 void
 scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val)
 {
-  scm_t_array_handle h;
-  size_t len;
-  ssize_t inc;
-  
-  scm_uniform_vector_elements (v, &h, &len, &inc);
-  scm_array_handle_set (&h, idx*inc, val);
-  scm_array_handle_release (&h);
+  if (!scm_is_uniform_vector (v))
+    scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
+  scm_c_generalized_vector_set_x (v, idx, val);
 }
 
 SCM_DEFINE (scm_uniform_vector_set_x, "uniform-vector-set!", 3, 0, 0,
            (SCM v, SCM idx, SCM val),
            "Set the element at index @var{idx} of the\n"
-           "homogenous numeric vector @var{v} to @var{val}.")
+           "homogeneous numeric vector @var{v} to @var{val}.")
 #define FUNC_NAME s_scm_uniform_vector_set_x
 {
   scm_c_uniform_vector_set_x (v, scm_to_size_t (idx), val);
@@ -193,15 +191,9 @@ SCM_DEFINE (scm_uniform_vector_to_list, "uniform-vector->list", 1, 0, 0,
            "Convert the uniform numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_uniform_vector_to_list
 {
-  SCM ret;
-  scm_t_array_handle h;
-  size_t len;
-  ssize_t inc;
-  
-  scm_uniform_vector_elements (uvec, &h, &len, &inc);
-  ret = scm_generalized_vector_to_list (uvec);
-  scm_array_handle_release (&h);
-  return ret;
+  if (!scm_is_uniform_vector (uvec))
+    scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, uvec, "uniform vector");
+  return scm_generalized_vector_to_list (uvec);
 }
 #undef FUNC_NAME