diff options
author | Andy Wingo <wingo@pobox.com> | 2009-07-17 01:08:35 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-07-19 14:53:03 +0200 |
commit | 2fa901a51f62da8a01112aefbf687530f4bff160 (patch) | |
tree | 98f0e185e3eb91ba3d7b0f07a29f75fc388a3397 /libguile/unif.h | |
parent | cf396142405d9076cc20eca9bf53376e80359a56 (diff) | |
download | guile-2fa901a51f62da8a01112aefbf687530f4bff160.tar.gz |
rename unif.[ch] to arrays.[ch]
* libguile/Makefile.am:
* libguile/unif.c:
* libguile/unif.h:
* libguile/arrays.c:
* libguile/arrays.h: Rename unif.[ch] to arrays.[ch].
* libguile.h:
* libguile/array-handle.c:
* libguile/array-map.c:
* libguile/bitvectors.c:
* libguile/bytevectors.c:
* libguile/eq.c:
* libguile/gc-card.c:
* libguile/gc-malloc.c:
* libguile/gc-mark.c:
* libguile/gc.c:
* libguile/init.c:
* libguile/inline.h:
* libguile/print.c:
* libguile/random.c:
* libguile/read.c:
* libguile/socket.c:
* libguile/sort.c:
* libguile/srfi-4.c:
* libguile/srfi-4.h:
* libguile/strports.c:
* libguile/vectors.c:
* libguile/vectors.h: Update includers.
Diffstat (limited to 'libguile/unif.h')
-rw-r--r-- | libguile/unif.h | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/libguile/unif.h b/libguile/unif.h deleted file mode 100644 index 983ce444f..000000000 --- a/libguile/unif.h +++ /dev/null @@ -1,110 +0,0 @@ -/* classes: h_files */ - -#ifndef SCM_UNIF_H -#define SCM_UNIF_H - -/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - - - -#include "libguile/__scm.h" -#include "libguile/print.h" -#include "libguile/array-handle.h" - - - -/* This file contains the definitions for arrays and bit vectors. - Uniform numeric vectors are now in srfi-4.c. -*/ - - -/** Arrays */ - -SCM_API SCM scm_array_p (SCM v); -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_from_contiguous_typed_array (SCM type, SCM bounds, - const void *bytes, - size_t byte_len); -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); -SCM_API SCM scm_shared_array_increments (SCM ra); -SCM_API SCM scm_make_shared_array (SCM oldra, SCM mapfunc, SCM dims); -SCM_API SCM scm_transpose_array (SCM ra, SCM args); -SCM_API SCM scm_enclose_array (SCM ra, SCM axes); -SCM_API SCM scm_array_in_bounds_p (SCM v, SCM args); -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_contents (SCM ra, SCM strict); -SCM_API SCM scm_uniform_array_read_x (SCM ra, SCM port_or_fd, - SCM start, SCM end); -SCM_API SCM scm_uniform_array_write (SCM v, SCM port_or_fd, - SCM start, SCM end); -SCM_API SCM scm_array_to_list (SCM v); -SCM_API SCM scm_list_to_array (SCM ndim, SCM lst); -SCM_API SCM scm_list_to_typed_array (SCM type, SCM ndim, SCM lst); -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_ra2contig (SCM ra, int copy); - -/* 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_INTERNAL SCM scm_i_make_array (int ndim, int enclosed); -SCM_INTERNAL SCM scm_i_cvref (SCM v, size_t p, int enclosed); -SCM_INTERNAL SCM scm_i_read_array (SCM port, int c); - -SCM_INTERNAL void scm_init_unif (void); - -#endif /* SCM_UNIF_H */ - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |