summaryrefslogtreecommitdiff
path: root/libguile/unif.h
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2005-01-11 00:26:23 +0000
committerMarius Vollmer <mvo@zagadka.de>2005-01-11 00:26:23 +0000
commit0cd6cb2fb2e4f3809ff11cfc0baa3014c666fcc0 (patch)
treeb5da207e5fe1f2753f109d24ee26f3c7727eaaac /libguile/unif.h
parent32ef775128452c386f2045374ff2a153a45cc7af (diff)
downloadguile-0cd6cb2fb2e4f3809ff11cfc0baa3014c666fcc0.tar.gz
(indices_to_pos, scm_array_handle_pos): Renamed
former to latter and made public. Changed all uses. (scm_i_make_ra): Made public, changed tag param to enclosed flag. (scm_make_ra): Deprecated, changed all uses to scm_i_make_ra. (scm_i_shap2ra): New internal version of scm_shap2ra. (scm_shap2ra): Deprecated, changed all uses to scm_i_shap2ra. (scm_i_ra_set_contp): New internal version of scm_ra_set_contp. (scm_ra_set_contp): Deprecated, changed all uses to scm_i_ra_set_contp. (scm_cvref, scm_aind, scm_raprin1): Deprecated.
Diffstat (limited to 'libguile/unif.h')
-rw-r--r--libguile/unif.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/libguile/unif.h b/libguile/unif.h
index bbaa3253d..7c93027be 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -94,7 +94,7 @@ SCM_API SCM scm_array_type (SCM ra);
SCM_API int scm_is_array (SCM obj);
SCM_API int scm_is_typed_array (SCM obj, SCM type);
-SCM_API SCM scm_i_read_array (SCM port, int c);
+SCM_API SCM scm_ra2contig (SCM ra, int copy);
struct scm_t_array_handle;
@@ -115,6 +115,7 @@ typedef struct scm_t_array_handle {
SCM_API void scm_array_get_handle (SCM array, scm_t_array_handle *h);
SCM_API size_t scm_array_handle_rank (scm_t_array_handle *h);
SCM_API scm_t_array_dim *scm_array_handle_dims (scm_t_array_handle *h);
+SCM_API ssize_t scm_array_handle_pos (scm_t_array_handle *h, SCM indices);
SCM_API const SCM *scm_array_handle_elements (scm_t_array_handle *h);
SCM_API SCM *scm_array_handle_writable_elements (scm_t_array_handle *h);
SCM_API void scm_array_handle_release (scm_t_array_handle *h);
@@ -139,6 +140,7 @@ SCM_API SCM scm_bit_position (SCM item, SCM v, SCM k);
SCM_API SCM scm_bit_set_star_x (SCM v, SCM kv, SCM obj);
SCM_API SCM scm_bit_count_star (SCM v, SCM kv, SCM obj);
SCM_API SCM scm_bit_invert_x (SCM v);
+SCM_API SCM scm_istr2bve (SCM str);
SCM_API int scm_is_bitvector (SCM obj);
SCM_API SCM scm_c_make_bitvector (size_t len, SCM fill);
@@ -159,6 +161,12 @@ SCM_API scm_t_uint32 *scm_bitvector_writable_elements (SCM vec,
size_t *lenp,
ssize_t *incp);
+/* internal. */
+
+SCM_API SCM scm_i_make_ra (int ndim, int enclosed);
+SCM_API SCM scm_i_cvref (SCM v, size_t p, int enclosed);
+SCM_API SCM scm_i_read_array (SCM port, int c);
+
/* deprecated. */
#if SCM_ENABLE_DEPRECATED
@@ -167,19 +175,13 @@ SCM_API SCM scm_make_uve (long k, SCM prot);
SCM_API SCM scm_array_prototype (SCM ra);
SCM_API SCM scm_list_to_uniform_array (SCM ndim, SCM prot, SCM lst);
SCM_API SCM scm_dimensions_to_uniform_array (SCM dims, SCM prot, SCM fill);
-
-#endif
-
SCM_API SCM scm_make_ra (int ndim);
-SCM_API void scm_ra_set_contp (SCM ra);
+SCM_API SCM scm_shap2ra (SCM args, const char *what);
SCM_API SCM scm_cvref (SCM v, unsigned long pos, SCM last);
-SCM_API SCM scm_istr2bve (SCM str);
-SCM_API int scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate);
+SCM_API void scm_ra_set_contp (SCM ra);
SCM_API long scm_aind (SCM ra, SCM args, const char *what);
-SCM_API SCM scm_shap2ra (SCM args, const char *what);
-SCM_API SCM scm_ra2contig (SCM ra, int copy);
-
-SCM_API SCM scm_i_cvref (SCM v, size_t p, int enclosed);
+SCM_API int scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate);
+#endif
SCM_API void scm_init_unif (void);