summaryrefslogtreecommitdiff
path: root/libguile/arrays.h
diff options
context:
space:
mode:
authorDaniel Llorens <lloda@sarc.name>2021-08-03 14:19:18 +0200
committerDaniel Llorens <lloda@sarc.name>2021-08-03 14:21:41 +0200
commitbc7bd22267903fcaab945fa6e4c03318f9fc664b (patch)
tree27eaf18624c0959fb7487f0073951b157ec9e835 /libguile/arrays.h
parentc78c130b1ddef6d6c290533f74ce1fbd51a4b19d (diff)
downloadguile-bc7bd22267903fcaab945fa6e4c03318f9fc664b.tar.gz
Merge libguile/generalized-arrays.* into libguile/arrays.*
* libguile/arrays.h: * libguile/arrays.c: As stated. * libguile/init.c: Remove call to scm_init_generalized_arrays(). Elsewhere fix references to generalized-arrays.*.
Diffstat (limited to 'libguile/arrays.h')
-rw-r--r--libguile/arrays.h33
1 files changed, 32 insertions, 1 deletions
diff --git a/libguile/arrays.h b/libguile/arrays.h
index 7221fdb63..8cc84c2b1 100644
--- a/libguile/arrays.h
+++ b/libguile/arrays.h
@@ -22,8 +22,8 @@
-#include "libguile/gc.h"
#include "libguile/print.h"
+#include "libguile/array-handle.h"
@@ -31,6 +31,12 @@
Also see ....
*/
+#define SCM_VALIDATE_ARRAY(pos, v) \
+ do { \
+ SCM_ASSERT (SCM_HEAP_OBJECT_P (v) \
+ && scm_is_true (scm_array_p (v, SCM_UNDEFINED)), \
+ v, pos, FUNC_NAME); \
+ } while (0)
/** Arrays */
@@ -57,6 +63,31 @@ SCM_API SCM scm_list_to_typed_array (SCM type, SCM ndim, SCM lst);
SCM_API size_t scm_c_array_rank (SCM ra);
SCM_API SCM scm_array_rank (SCM ra);
+SCM_API int scm_is_array (SCM obj);
+SCM_API SCM scm_array_p (SCM v, SCM unused);
+SCM_INTERNAL SCM scm_array_p_2 (SCM);
+
+SCM_API int scm_is_typed_array (SCM obj, SCM type);
+SCM_API SCM scm_typed_array_p (SCM v, SCM type);
+
+SCM_API size_t scm_c_array_length (SCM ra);
+SCM_API SCM scm_array_length (SCM ra);
+
+SCM_API SCM scm_array_dimensions (SCM ra);
+SCM_API SCM scm_array_type (SCM ra);
+SCM_API SCM scm_array_type_code (SCM ra);
+SCM_API SCM scm_array_in_bounds_p (SCM v, SCM args);
+
+SCM_API SCM scm_c_array_ref_1 (SCM v, ssize_t idx0);
+SCM_API SCM scm_c_array_ref_2 (SCM v, ssize_t idx0, ssize_t idx1);
+
+SCM_API void scm_c_array_set_1_x (SCM v, SCM obj, ssize_t idx0);
+SCM_API void scm_c_array_set_2_x (SCM v, SCM obj, ssize_t idx0, ssize_t idx1);
+
+SCM_API SCM scm_array_ref (SCM v, SCM args);
+SCM_API SCM scm_array_set_x (SCM v, SCM obj, SCM args);
+SCM_API SCM scm_array_to_list (SCM v);
+
/* internal. */
/* see scm_from_contiguous_array for these three */