diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-01-09 17:24:57 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-01-09 17:50:56 +0100 |
| commit | b2637c985ce93bc15e0378b8120d04a98ebdd212 (patch) | |
| tree | bde14a0e946c1a9e165284b75e91d17b6dca5aa1 /libguile/arrays.c | |
| parent | 017eb4a6be938c50df7fe6a27ca38486e75e02d5 (diff) | |
| download | guile-b2637c985ce93bc15e0378b8120d04a98ebdd212.tar.gz | |
allocate a tc7 to arrays
* libguile/tags.h (scm_tc7_array): Allocate a tag for arrays.
* libguile/arrays.h (SCM_I_ARRAYP): Change to use scm_tc7_array. The
previous definition was not externally usable because scm_i_tc16_array
was internal.
(scm_i_print_array): Declare, though internally.
* libguile/arrays.c (scm_i_make_array): Use scm_cell with the tc7
instead of NEWSMOB.
(scm_i_print_array): Make not static.
(SCM_ARRAY_IMPLEMENTATION): Adapt.
(scm_init_arrays): Remove array smob declaration.
* libguile/eq.c (scm_equal_p): Refactor to put the string, pointer, and
bytevector cases in the switch. Add a case for arrays.
* libguile/goops.c: Add <array> declarations.
* libguile/print.c (iprin1): Call scm_i_print_array as needed.
* libguile/evalext.c (scm_self_evaluating_p): Add a case for arrays.
Diffstat (limited to 'libguile/arrays.c')
| -rw-r--r-- | libguile/arrays.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libguile/arrays.c b/libguile/arrays.c index d99081caf..c17f125fb 100644 --- a/libguile/arrays.c +++ b/libguile/arrays.c @@ -33,7 +33,6 @@ #include "libguile/chars.h" #include "libguile/eval.h" #include "libguile/fports.h" -#include "libguile/smob.h" #include "libguile/feature.h" #include "libguile/root.h" #include "libguile/strings.h" @@ -54,11 +53,10 @@ #include "libguile/uniform.h" -scm_t_bits scm_i_tc16_array; #define SCM_SET_ARRAY_CONTIGUOUS_FLAG(x) \ - (SCM_SET_SMOB_FLAGS ((x), SCM_SMOB_FLAGS (x) | SCM_I_ARRAY_FLAG_CONTIGUOUS)) + (SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) | (SCM_I_ARRAY_FLAG_CONTIGUOUS << 16))) #define SCM_CLR_ARRAY_CONTIGUOUS_FLAG(x) \ - (SCM_SET_SMOB_FLAGS ((x), SCM_SMOB_FLAGS (x) & ~SCM_I_ARRAY_FLAG_CONTIGUOUS)) + (SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) & ~(SCM_I_ARRAY_FLAG_CONTIGUOUS << 16))) SCM_DEFINE (scm_shared_array_root, "shared-array-root", 1, 0, 0, @@ -115,10 +113,10 @@ SCM scm_i_make_array (int ndim) { SCM ra; - SCM_NEWSMOB(ra, ((scm_t_bits) ndim << 17) + scm_i_tc16_array, - scm_gc_malloc ((sizeof (scm_i_t_array) + - ndim * sizeof (scm_t_array_dim)), - "array")); + ra = scm_cell (((scm_t_bits) ndim << 17) + scm_tc7_array, + SCM_UNPACK (scm_gc_malloc ((sizeof (scm_i_t_array) + + ndim * sizeof (scm_t_array_dim)), + "array"))); SCM_I_ARRAY_V (ra) = SCM_BOOL_F; return ra; } @@ -743,7 +741,7 @@ scm_i_print_array_dimension (scm_t_array_handle *h, int dim, int pos, /* Print an array. */ -static int +int scm_i_print_array (SCM array, SCM port, scm_print_state *pstate) { scm_t_array_handle h; @@ -1015,18 +1013,14 @@ array_get_handle (SCM array, scm_t_array_handle *h) h->base = SCM_I_ARRAY_BASE (array); } -SCM_ARRAY_IMPLEMENTATION (SCM_SMOB_TYPE_BITS (scm_i_tc16_array), - SCM_SMOB_TYPE_MASK, +SCM_ARRAY_IMPLEMENTATION (scm_tc7_array, + 0x7f, array_handle_ref, array_handle_set, array_get_handle) void scm_init_arrays () { - scm_i_tc16_array = scm_make_smob_type ("array", 0); - scm_set_smob_print (scm_i_tc16_array, scm_i_print_array); - scm_set_smob_equalp (scm_i_tc16_array, scm_array_equal_p); - scm_add_feature ("array"); #include "libguile/arrays.x" |