The FSF has a new address.

[bpt/guile.git] / libguile / unif.h

diff --git a/libguile/unif.h b/libguile/unif.h
index bbaa325..d13e053 100644 (file)
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 \f
@@ -41,36 +41,12 @@ typedef struct scm_t_array_dim
   ssize_t inc;
 } scm_t_array_dim;
 
-typedef struct scm_t_array
-{
-  SCM v;  /* the contents of the array, e.g., a vector or uniform vector.  */
-  unsigned long base;
-} scm_t_array;
-
-SCM_API scm_t_bits scm_tc16_array;
-SCM_API scm_t_bits scm_tc16_enclosed_array;
-
-#define SCM_ARRAY_FLAG_CONTIGUOUS (1 << 16)
-
-#define SCM_ARRAYP(a)      SCM_TYP16_PREDICATE (scm_tc16_array, a)
-#define SCM_ENCLOSED_ARRAYP(a) SCM_TYP16_PREDICATE (scm_tc16_enclosed_array, a)
-#define SCM_ARRAY_NDIM(x)   ((size_t) (SCM_CELL_WORD_0 (x) >> 17))
-#define SCM_ARRAY_CONTP(x)  (SCM_CELL_WORD_0 (x) & SCM_ARRAY_FLAG_CONTIGUOUS)
-#define SCM_SET_ARRAY_CONTIGUOUS_FLAG(x) \
-  (SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) | SCM_ARRAY_FLAG_CONTIGUOUS))
-#define SCM_CLR_ARRAY_CONTIGUOUS_FLAG(x) \
-  (SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) & ~SCM_ARRAY_FLAG_CONTIGUOUS))
-
-#define SCM_ARRAY_MEM(a)  ((scm_t_array *) SCM_CELL_WORD_1 (a))
-#define SCM_ARRAY_V(a)           (SCM_ARRAY_MEM (a)->v)
-#define SCM_ARRAY_BASE(a) (SCM_ARRAY_MEM (a)->base)
-#define SCM_ARRAY_DIMS(a) ((scm_t_array_dim *)((char *) SCM_ARRAY_MEM (a) + sizeof (scm_t_array))) 
-
 SCM_API SCM scm_array_p (SCM v, SCM prot);
 SCM_API SCM scm_typed_array_p (SCM v, SCM type);
 SCM_API SCM scm_make_array (SCM fill, SCM bounds);
 SCM_API SCM scm_make_typed_array (SCM type, SCM fill, SCM bounds);
 SCM_API SCM scm_array_rank (SCM ra);
+SCM_API size_t scm_c_array_rank (SCM ra);
 SCM_API SCM scm_array_dimensions (SCM ra);
 SCM_API SCM scm_shared_array_root (SCM ra);
 SCM_API SCM scm_shared_array_offset (SCM ra);
@@ -94,7 +70,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 +91,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 +116,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 +137,35 @@ SCM_API scm_t_uint32 *scm_bitvector_writable_elements (SCM vec,
                                                       size_t *lenp,
                                                       ssize_t *incp);
 
+/* internal. */
+
+typedef struct scm_i_t_array
+{
+  SCM v;  /* the contents of the array, e.g., a vector or uniform vector.  */
+  unsigned long base;
+} scm_i_t_array;
+
+SCM_API scm_t_bits scm_i_tc16_array;
+SCM_API scm_t_bits scm_i_tc16_enclosed_array;
+
+#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 16)
+
+#define SCM_I_ARRAYP(a)            SCM_TYP16_PREDICATE (scm_i_tc16_array, a)
+#define SCM_I_ENCLOSED_ARRAYP(a) \
+                            SCM_TYP16_PREDICATE (scm_i_tc16_enclosed_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)
+
+#define SCM_I_ARRAY_MEM(a)  ((scm_i_t_array *) SCM_CELL_WORD_1 (a))
+#define SCM_I_ARRAY_V(a)    (SCM_I_ARRAY_MEM (a)->v)
+#define SCM_I_ARRAY_BASE(a) (SCM_I_ARRAY_MEM (a)->base)
+#define SCM_I_ARRAY_DIMS(a) \
+  ((scm_t_array_dim *)((char *) SCM_I_ARRAY_MEM (a) + sizeof (scm_i_t_array)))
+
+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 +174,14 @@ 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 int scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate);
 
-SCM_API SCM scm_i_cvref (SCM v, size_t p, int enclosed);
+#endif
 
 SCM_API void scm_init_unif (void);