summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Llorens <lloda@sarc.name>2020-02-07 15:43:24 +0100
committerDaniel Llorens <lloda@sarc.name>2020-04-09 16:59:39 +0200
commitedf9abb4a021f417e99df6c25c34ee59cb30a512 (patch)
tree2ed54a6a5a6ea0c4a3ed1a99655b83f32b3166ae
parentd88d4d55588198754478731713e1450cae16446f (diff)
downloadguile-edf9abb4a021f417e99df6c25c34ee59cb30a512.tar.gz
Remove 'contiguous' flag in arrays
Was never used, so we save having to set it on various ops. * libguile/arrays.h (SCM_I_ARRAY_FLAG_CONTIGUOUS, SCM_SET_ARRAY_CONTIGUOUS_FLAG, SCM_CLR_ARRAY_CONTIGUOUS_FLAG, SCM_I_ARRAY_CONTP): Remove. * libguile/arrays.c (scm_i_ra_set_contp): Remove. Elsewhere remove all uses of this and the other macros.
-rw-r--r--NEWS-wip-vector-cleanup.txt5
-rw-r--r--libguile/arrays.c26
-rw-r--r--libguile/arrays.h8
3 files changed, 5 insertions, 34 deletions
diff --git a/NEWS-wip-vector-cleanup.txt b/NEWS-wip-vector-cleanup.txt
index 84b5c7a79..e7e4ea169 100644
--- a/NEWS-wip-vector-cleanup.txt
+++ b/NEWS-wip-vector-cleanup.txt
@@ -19,6 +19,11 @@ Use scm_is_vector instead.
If you were including these headers directly for any reason, just include libguile.h instead.
+** scm_from_contiguous_typed_array has been removed.
+
+This function was undocumented. Instead, use scm_make_typed_array and
+the array handle functions to copy data to the new array.
+
* Backward incompatible changes
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 95bc6e1b2..e6af6295e 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -604,7 +604,6 @@ SCM_DEFINE (scm_make_typed_array, "make-typed-array", 2, 0, 1,
SCM ra;
ra = scm_i_shap2ra (bounds);
- SCM_SET_ARRAY_CONTIGUOUS_FLAG (ra);
s = SCM_I_ARRAY_DIMS (ra);
k = SCM_I_ARRAY_NDIM (ra);
@@ -637,29 +636,6 @@ SCM_DEFINE (scm_make_array, "make-array", 1, 0, 1,
}
#undef FUNC_NAME
-/* see scm_from_contiguous_array */
-static void
-scm_i_ra_set_contp (SCM ra)
-{
- size_t k = SCM_I_ARRAY_NDIM (ra);
- if (k)
- {
- ssize_t inc = SCM_I_ARRAY_DIMS (ra)[k - 1].inc;
- while (k--)
- {
- if (inc != SCM_I_ARRAY_DIMS (ra)[k].inc)
- {
- SCM_CLR_ARRAY_CONTIGUOUS_FLAG (ra);
- return;
- }
- inc *= (SCM_I_ARRAY_DIMS (ra)[k].ubnd
- - SCM_I_ARRAY_DIMS (ra)[k].lbnd + 1);
- }
- }
- SCM_SET_ARRAY_CONTIGUOUS_FLAG (ra);
-}
-
-
SCM_DEFINE (scm_make_shared_array, "make-shared-array", 2, 0, 1,
(SCM oldra, SCM mapfunc, SCM dims),
"@code{make-shared-array} can be used to create shared subarrays\n"
@@ -772,7 +748,6 @@ SCM_DEFINE (scm_make_shared_array, "make-shared-array", 2, 0, 1,
return scm_make_generalized_vector (scm_array_type (ra), SCM_INUM0,
SCM_UNDEFINED);
}
- scm_i_ra_set_contp (ra);
return ra;
}
#undef FUNC_NAME
@@ -1043,7 +1018,6 @@ SCM_DEFINE (scm_transpose_array, "transpose-array", 1, 0, 1,
}
if (ndim > 0)
SCM_MISC_ERROR ("bad argument list", SCM_EOL);
- scm_i_ra_set_contp (res);
return res;
}
}
diff --git a/libguile/arrays.h b/libguile/arrays.h
index 0d2f334b0..0d2eae2a0 100644
--- a/libguile/arrays.h
+++ b/libguile/arrays.h
@@ -89,16 +89,8 @@ SCM_API SCM scm_array_rank (SCM ra);
/* internal. */
-/* see scm_from_contiguous_array for these three */
-#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 0)
-#define SCM_SET_ARRAY_CONTIGUOUS_FLAG(x) \
- (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_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) & ~(SCM_I_ARRAY_FLAG_CONTIGUOUS << 16)))
-
#define SCM_I_ARRAYP(a) SCM_TYP16_PREDICATE (scm_tc7_array, a)
#define SCM_I_ARRAY_NDIM(x) ((size_t) (SCM_CELL_WORD_0 (x)>>17))
-#define SCM_I_ARRAY_CONTP(x) (SCM_CELL_WORD_0 (x) & (SCM_I_ARRAY_FLAG_CONTIGUOUS << 16))
#define SCM_I_ARRAY_V(a) SCM_CELL_OBJECT_1 (a)
#define SCM_I_ARRAY_BASE(a) ((size_t) SCM_CELL_WORD_2 (a))