scm_wta_* procedures replace SCM_WTA_* macros

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

diff --git a/libguile/vectors.c b/libguile/vectors.c
index 2805278..e43fa0e 100644 (file)
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -123,7 +123,7 @@ scm_vector_length (SCM v)
       return scm_from_size_t (dim->ubnd - dim->lbnd + 1);
     }
   else
-    SCM_WTA_DISPATCH_1 (g_vector_length, v, 1, NULL);
+    return scm_wta_dispatch_1 (g_vector_length, v, 1, "vector-length");
 }
 
 size_t
@@ -241,7 +241,8 @@ scm_c_vector_ref (SCM v, size_t k)
       scm_wrong_type_arg_msg (NULL, 0, v, "non-uniform vector");
     }
   else
-    SCM_WTA_DISPATCH_2 (g_vector_ref, v, scm_from_size_t (k), 2, NULL);
+    return scm_wta_dispatch_2 (g_vector_ref, v, scm_from_size_t (k), 2,
+                               "vector-ref");
 }
 
 SCM_GPROC (s_vector_set_x, "vector-set!", 3, 0, 0, scm_vector_set_x, g_vector_set_x);
@@ -307,8 +308,10 @@ scm_c_vector_set_x (SCM v, size_t k, SCM obj)
   else
     {
       if (SCM_UNPACK (g_vector_set_x))
-       scm_apply_generic (g_vector_set_x,
-                          scm_list_3 (v, scm_from_size_t (k), obj));
+       scm_wta_dispatch_n (g_vector_set_x,
+                            scm_list_3 (v, scm_from_size_t (k), obj),
+                            0,
+                            "vector-set!");
       else
        scm_wrong_type_arg_msg (NULL, 0, v, "vector");
     }