mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
a268973767
* libguile/srfi-4.h: * libguile/srfi-4.c (scm_make_srfi_4_vector): New function, exported by (srfi srfi-4 gnu). * libguile/srfi-4.i.c: Removed. * module/srfi/srfi-4.scm: * module/srfi/srfi-4/gnu.scm: Reimplement srfi-4 vectors on top of bytevectors. The implementation is mostly in Scheme now. * test-suite/tests/unif.test: Update to use (srfi srfi-4 gnu). * libguile/bytevectors.c (bytevector_ref_c32, bytevector_ref_c64) (bytevector_set_c32, bytevector_set_c64): Fix some embarrassing bugs. Still need to do an upper bounds check. * libguile/deprecated.h: Remove deprecated array functions: scm_i_arrayp, scm_i_array_ndim, scm_i_array_mem, scm_i_array_v, scm_i_array_base, scm_i_array_dims, and the deprecated macros: SCM_ARRAYP, SCM_ARRAY_NDIM, SCM_ARRAY_CONTP, SCM_ARRAY_MEM, SCM_ARRAY_V, SCM_ARRAY_BASE, SCM_ARRAY_DIMS. * libguile/deprecated.c (scm_uniform_vector_read_x) (scm_uniform_vector_write, scm_uniform_array_read_x) (scm_uniform_array_write): Newly deprecated functions. * libguile/generalized-arrays.c (scm_array_type): Remove the bytevector hack. * libguile/objcodes.c (scm_bytecode_to_objcode, scm_objcode_to_bytecode): Rework to operate on bytevectors, as scm_make_u8vector now causes a module lookup, which can't be done e.g. when loading the VM boot program for psyntax-pp.go on a fresh bootstrap. * libguile/objcodes.h (SCM_F_OBJCODE_IS_BYTEVECTOR): (SCM_OBJCODE_IS_BYTEVECTOR): s/U8VECTOR/BYTEVECTOR/. * module/ice-9/boot-9.scm (the-scm-module): A terrible hack to pull in (srfi srfi-4), as the bindings are primarily there now. We'll worry about this later.
85 lines
2.7 KiB
C
85 lines
2.7 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_ARRAY_H
|
||
#define SCM_ARRAY_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"
|
||
|
||
|
||
|
||
/* Multidimensional arrays. Woo hoo!
|
||
Also see ....
|
||
*/
|
||
|
||
|
||
/** Arrays */
|
||
|
||
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_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_array_contents (SCM ra, SCM strict);
|
||
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);
|
||
|
||
/* 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;
|
||
|
||
#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 0)
|
||
|
||
#define SCM_I_ARRAYP(a) SCM_TYP16_PREDICATE (scm_i_tc16_array, a)
|
||
#define SCM_I_ARRAY_NDIM(x) ((size_t) (SCM_SMOB_FLAGS (x)>>1))
|
||
#define SCM_I_ARRAY_CONTP(x) (SCM_SMOB_FLAGS(x) & SCM_I_ARRAY_FLAG_CONTIGUOUS)
|
||
|
||
#define SCM_I_ARRAY_MEM(a) ((scm_i_t_array *) SCM_SMOB_DATA_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);
|
||
SCM_INTERNAL SCM scm_i_read_array (SCM port, int c);
|
||
|
||
SCM_INTERNAL void scm_init_arrays (void);
|
||
|
||
#endif /* SCM_ARRAYS_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|