mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
68eb519089
scm_from_contiguous_array() was undocumented, unused within Guile, and can be replaced by make-array + array-copy! without requiring contiguity and without loss of performance. * libguile/arrays.c (scm_array_contents): Do not rely on SCM_I_ARRAY_CONTP. * test-suite/tests/arrays.test: Test array-contents with 0-rank array. * libguile/arrays.h: Declare scm_i_shap2ra(), SCM_SET_ARRAY_CONTIGUOUS_FLAG, SCM_CLR_ARRAY_CONTIGUOUS_FLAG so that scm_from_contiguous_array() can keep using them. * libguile/deprecated.c (scm_from_contiguous_array): Move here from arrays.c. * libguile/deprecated.h (scm_from_contiguous_array): Deprecate. * NEWS: Add deprecation notice.
94 lines
3.2 KiB
C
94 lines
3.2 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,
|
||
* 2010, 2012 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_array_from_s (SCM ra, SCM indices);
|
||
SCM_API SCM scm_array_from (SCM ra, SCM indices);
|
||
SCM_API SCM scm_array_amend_x (SCM ra, SCM b, SCM indices);
|
||
|
||
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 size_t scm_c_array_rank (SCM ra);
|
||
SCM_API SCM scm_array_rank (SCM ra);
|
||
|
||
/* internal. */
|
||
|
||
/* see scm_from_contiguous_array for these three */
|
||
#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 0)
|
||
#define SCM_SET_ARRAY_CONTIGUOUS_FLAG(x) \
|
||
(SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) | (SCM_I_ARRAY_FLAG_CONTIGUOUS << 16)))
|
||
#define SCM_CLR_ARRAY_CONTIGUOUS_FLAG(x) \
|
||
(SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) & ~(SCM_I_ARRAY_FLAG_CONTIGUOUS << 16)))
|
||
|
||
#define SCM_I_ARRAYP(a) SCM_TYP16_PREDICATE (scm_tc7_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 << 16))
|
||
|
||
#define SCM_I_ARRAY_V(a) SCM_CELL_OBJECT_1 (a)
|
||
#define SCM_I_ARRAY_BASE(a) ((size_t) SCM_CELL_WORD_2 (a))
|
||
#define SCM_I_ARRAY_DIMS(a) ((scm_t_array_dim *) SCM_CELL_OBJECT_LOC (a, 3))
|
||
|
||
#define SCM_I_ARRAY_SET_V(a, v) SCM_SET_CELL_OBJECT_1(a, v)
|
||
#define SCM_I_ARRAY_SET_BASE(a, base) SCM_SET_CELL_WORD_2(a, base)
|
||
|
||
SCM_INTERNAL SCM scm_i_make_array (int ndim);
|
||
SCM_INTERNAL int scm_i_print_array (SCM array, SCM port, scm_print_state *pstate);
|
||
SCM_INTERNAL SCM scm_i_shap2ra (SCM args);
|
||
|
||
SCM_INTERNAL void scm_init_arrays (void);
|
||
|
||
#endif /* SCM_ARRAYS_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|