diff --git a/libguile/deprecated.c b/libguile/deprecated.c index 3b6290d9e..90fe7c064 100644 --- a/libguile/deprecated.c +++ b/libguile/deprecated.c @@ -33,6 +33,7 @@ #include "symbols.h" #include "threads.h" #include "variable.h" +#include "vectors.h" #include "deprecated.h" @@ -738,6 +739,32 @@ scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags) +size_t +scm_i_simple_vector_length (SCM v) +{ + scm_c_issue_deprecation_warning + ("SCM_SIMPLE_VECTOR_LENGTH is deprecated. Use scm_c_vector_length instead."); + return scm_c_vector_length (v); +} + +SCM +scm_i_simple_vector_ref (SCM v, size_t k) +{ + scm_c_issue_deprecation_warning + ("SCM_SIMPLE_VECTOR_REF is deprecated. Use scm_c_vector_ref instead."); + return scm_c_vector_ref (v, k); +} + +void +scm_i_simple_vector_set_x (SCM v, size_t k, SCM val) +{ + scm_c_issue_deprecation_warning + ("SCM_SIMPLE_VECTOR_SET is deprecated. Use scm_c_vector_set_x instead."); + scm_c_vector_set_x (v, k, val); +} + + + void scm_i_init_deprecated () { diff --git a/libguile/deprecated.h b/libguile/deprecated.h index 2cc495432..199a800f3 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -122,6 +122,14 @@ SCM_DEPRECATED SCM scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags); #define SCM_VALIDATE_PAIR(cell, expr) SCM_VALIDATE_PAIR__Gone__Inline_second_argument_at_use +SCM_DEPRECATED size_t scm_i_simple_vector_length (SCM v); +SCM_DEPRECATED SCM scm_i_simple_vector_ref (SCM v, size_t k); +SCM_DEPRECATED void scm_i_simple_vector_set_x (SCM v, size_t k, SCM val); + +#define SCM_SIMPLE_VECTOR_LENGTH(x) (scm_i_simple_vector_length (x)) +#define SCM_SIMPLE_VECTOR_REF(x,idx) (scm_i_simple_vector_ref (x, idx)) +#define SCM_SIMPLE_VECTOR_SET(x,idx,val) (scm_i_simple_vector_set_x (x, idx, val)) + /* Deprecated declarations go here. */ void scm_i_init_deprecated (void); diff --git a/libguile/vectors.h b/libguile/vectors.h index 005999a2b..2482faddd 100644 --- a/libguile/vectors.h +++ b/libguile/vectors.h @@ -66,12 +66,6 @@ SCM_API SCM *scm_vector_writable_elements (SCM array, SCM_ASSERT (scm_is_vector (v) && len == scm_c_vector_length (v), v, pos, FUNC_NAME); \ } while (0) -/* Fast, non-checking accessors - */ -#define SCM_SIMPLE_VECTOR_LENGTH(x) SCM_I_VECTOR_LENGTH(x) -#define SCM_SIMPLE_VECTOR_REF(x,idx) ((SCM_I_VECTOR_ELTS(x))[idx]) -#define SCM_SIMPLE_VECTOR_SET(x,idx,val) ((SCM_I_VECTOR_WELTS(x))[idx]=(val)) - /* Internals */