summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
Diffstat (limited to 'libguile')
-rw-r--r--libguile/bitvectors.c87
-rw-r--r--libguile/bitvectors.h3
-rw-r--r--libguile/deprecated.c36
-rw-r--r--libguile/deprecated.h1
4 files changed, 84 insertions, 43 deletions
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 87ad6e84a..077bc556c 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -149,10 +149,10 @@ scm_c_make_bitvector (size_t len, SCM fill)
"bitvector");
res = scm_double_cell (scm_tc7_bitvector, len, (scm_t_bits)bits, 0);
- if (!SCM_UNBNDP (fill))
- scm_bitvector_fill_x (res, fill);
+ if (SCM_UNBNDP (fill) || !scm_is_true (fill))
+ scm_c_bitvector_clear_all_bits_x (res);
else
- memset (bits, 0, sizeof (uint32_t) * word_len);
+ scm_c_bitvector_set_all_bits_x (res);
return res;
}
@@ -344,56 +344,59 @@ SCM_DEFINE_STATIC (scm_bitvector_clear_bit_x, "bitvector-clear-bit!", 2, 0, 0,
}
#undef FUNC_NAME
-SCM_DEFINE (scm_bitvector_fill_x, "bitvector-fill!", 2, 0, 0,
- (SCM vec, SCM val),
- "Set all elements of the bitvector\n"
- "@var{vec} when @var{val} is true, else clear them.")
-#define FUNC_NAME s_scm_bitvector_fill_x
+void
+scm_c_bitvector_set_all_bits_x (SCM bv)
+#define FUNC_NAME "bitvector-set-all-bits!"
{
- if (IS_MUTABLE_BITVECTOR (vec))
- {
- size_t len = BITVECTOR_LENGTH (vec);
-
- if (len > 0)
- {
- uint32_t *bits = BITVECTOR_BITS (vec);
- size_t word_len = (len + 31) / 32;
- uint32_t last_mask = ((uint32_t)-1) >> (32*word_len - len);
+ VALIDATE_MUTABLE_BITVECTOR (1, bv);
+ size_t len = BITVECTOR_LENGTH (bv);
- if (scm_is_true (val))
- {
- memset (bits, 0xFF, sizeof(uint32_t)*(word_len-1));
- bits[word_len-1] |= last_mask;
- }
- else
- {
- memset (bits, 0x00, sizeof(uint32_t)*(word_len-1));
- bits[word_len-1] &= ~last_mask;
- }
- }
- }
- else
+ if (len > 0)
{
- scm_t_array_handle handle;
- size_t off, len;
- ssize_t inc;
+ uint32_t *bits = BITVECTOR_BITS (bv);
+ size_t word_len = (len + 31) / 32;
+ uint32_t last_mask = ((uint32_t)-1) >> (32*word_len - len);
- scm_bitvector_writable_elements (vec, &handle, &off, &len, &inc);
+ memset (bits, 0xFF, sizeof(uint32_t)*(word_len-1));
+ bits[word_len-1] |= last_mask;
+ }
+}
+#undef FUNC_NAME
- scm_c_issue_deprecation_warning
- ("Using bitvector-fill! on arrays is deprecated. "
- "Use array-set! instead.");
+void
+scm_c_bitvector_clear_all_bits_x (SCM bv)
+#define FUNC_NAME "bitvector-clear-all-bits!"
+{
+ VALIDATE_MUTABLE_BITVECTOR (1, bv);
+ size_t len = BITVECTOR_LENGTH (bv);
- size_t i;
- for (i = 0; i < len; i++)
- scm_array_handle_set (&handle, i*inc, val);
+ if (len > 0)
+ {
+ uint32_t *bits = BITVECTOR_BITS (bv);
+ size_t word_len = (len + 31) / 32;
+ uint32_t last_mask = ((uint32_t)-1) >> (32*word_len - len);
- scm_array_handle_release (&handle);
+ memset (bits, 0x00, sizeof(uint32_t)*(word_len-1));
+ bits[word_len-1] &= ~last_mask;
}
+}
+#undef FUNC_NAME
+SCM_DEFINE_STATIC (scm_bitvector_set_all_bits_x,
+ "bitvector-set-all-bits!", 1, 0, 0, (SCM vec),
+ "Set all elements of the bitvector @var{vec}.")
+{
+ scm_c_bitvector_set_all_bits_x (vec);
+ return SCM_UNSPECIFIED;
+}
+
+SCM_DEFINE_STATIC (scm_bitvector_clear_all_bits_x,
+ "bitvector-clear-all-bits!", 1, 0, 0, (SCM vec),
+ "Clear all elements of the bitvector @var{vec}.")
+{
+ scm_c_bitvector_clear_all_bits_x (vec);
return SCM_UNSPECIFIED;
}
-#undef FUNC_NAME
SCM_DEFINE (scm_list_to_bitvector, "list->bitvector", 1, 0, 0,
(SCM list),
diff --git a/libguile/bitvectors.h b/libguile/bitvectors.h
index 7061d3848..ffeb5a894 100644
--- a/libguile/bitvectors.h
+++ b/libguile/bitvectors.h
@@ -38,7 +38,6 @@ SCM_API SCM scm_make_bitvector (SCM len, SCM fill);
SCM_API SCM scm_bitvector_length (SCM vec);
SCM_API SCM scm_list_to_bitvector (SCM list);
SCM_API SCM scm_bitvector_to_list (SCM vec);
-SCM_API SCM scm_bitvector_fill_x (SCM vec, SCM val);
SCM_API SCM scm_bitvector_count (SCM v);
SCM_API SCM scm_bitvector_position (SCM v, SCM item, SCM start);
@@ -55,6 +54,8 @@ SCM_API int scm_c_bitvector_bit_is_set (SCM vec, size_t idx);
SCM_API int scm_c_bitvector_bit_is_clear (SCM vec, size_t idx);
SCM_API void scm_c_bitvector_set_bit_x (SCM vec, size_t idx);
SCM_API void scm_c_bitvector_clear_bit_x (SCM vec, size_t idx);
+SCM_API void scm_c_bitvector_set_all_bits_x (SCM vec);
+SCM_API void scm_c_bitvector_clear_all_bits_x (SCM vec);
SCM_API const uint32_t *scm_array_handle_bit_elements (scm_t_array_handle *h);
SCM_API uint32_t *scm_array_handle_bit_writable_elements (scm_t_array_handle *h);
SCM_API size_t scm_array_handle_bit_elements_offset (scm_t_array_handle *h);
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index 24a50ee3b..3682a0c04 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -170,6 +170,42 @@ SCM_DEFINE (scm_bitvector_set_x, "bitvector-set!", 3, 0, 0,
}
#undef FUNC_NAME
+SCM_DEFINE (scm_bitvector_fill_x, "bitvector-fill!", 2, 0, 0,
+ (SCM vec, SCM val),
+ "Set all elements of the bitvector\n"
+ "@var{vec} when @var{val} is true, else clear them.")
+#define FUNC_NAME s_scm_bitvector_fill_x
+{
+ scm_c_issue_deprecation_warning
+ ("bitvector-fill! is deprecated. Use bitvector-set-all-bits! or "
+ "bitvector-clear-all-bits! instead.");
+
+ if (scm_is_bitvector (vec))
+ {
+ if (scm_is_true (val))
+ scm_c_bitvector_set_all_bits_x (vec);
+ else
+ scm_c_bitvector_clear_all_bits_x (vec);
+
+ return SCM_UNSPECIFIED;
+ }
+
+ scm_t_array_handle handle;
+ size_t off, len;
+ ssize_t inc;
+
+ scm_bitvector_writable_elements (vec, &handle, &off, &len, &inc);
+
+ size_t i;
+ for (i = 0; i < len; i++)
+ scm_array_handle_set (&handle, i*inc, val);
+
+ scm_array_handle_release (&handle);
+
+ return SCM_UNSPECIFIED;
+}
+#undef FUNC_NAME
+
SCM_DEFINE (scm_bit_count, "bit-count", 2, 0, 0,
(SCM b, SCM bitvector),
"Return the number of occurrences of the boolean @var{b} in\n"
diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index a2438310b..a0ccac75d 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -119,6 +119,7 @@ SCM_DEPRECATED SCM scm_c_bitvector_ref (SCM vec, size_t idx);
SCM_DEPRECATED SCM scm_bitvector_ref (SCM vec, SCM idx);
SCM_DEPRECATED void scm_c_bitvector_set_x (SCM vec, size_t idx, SCM val);
SCM_DEPRECATED SCM scm_bitvector_set_x (SCM vec, SCM idx, SCM val);
+SCM_DEPRECATED SCM scm_bitvector_fill_x (SCM vec, SCM val);
SCM_DEPRECATED SCM scm_bit_count (SCM item, SCM seq);
SCM_DEPRECATED SCM scm_bit_position (SCM item, SCM v, SCM k);
SCM_DEPRECATED SCM scm_bit_set_star_x (SCM v, SCM kv, SCM obj);