mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 03:30:27 +02:00
optimize access to arrays of rank 1 or 2
* libguile/array-handle.c (scm_array_handle_pos_1):
(scm_array_handle_pos_2): New functions.
* libguile/generalized-arrays.c (scm_c_array_ref_1, scm_c_array_ref_2):
(scm_c_array_set_1_x, scm_c_array_set_2_x): New functions.
(scm_i_array_ref, scm_i_array_set_x): New subr bindings for array-ref
and array-set! that avoid consing for arrays of rank 1 or 2.
* test-suite/tests/arrays.test ("array-set!"): Fix expected exception
for wrong number of indices.
This commit is contained in:
Andy Wingo
parent
18cd9aff94
commit
336c921146
5 changed files with 154 additions and 17 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2013 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
|
||||
|
|
@ -97,6 +97,47 @@ scm_array_handle_pos (scm_t_array_handle *h, SCM indices)
|
|||
return pos;
|
||||
}
|
||||
|
||||
static void
|
||||
check_array_index_bounds (scm_t_array_dim *dim, ssize_t idx)
|
||||
{
|
||||
if (idx < dim->lbnd || idx > dim->ubnd)
|
||||
scm_error (scm_out_of_range_key, NULL, "Value out of range ~S to ~S: ~S",
|
||||
scm_list_3 (scm_from_ssize_t (dim->lbnd),
|
||||
scm_from_ssize_t (dim->ubnd),
|
||||
scm_from_ssize_t (idx)),
|
||||
scm_list_1 (scm_from_ssize_t (idx)));
|
||||
}
|
||||
|
||||
ssize_t
|
||||
scm_array_handle_pos_1 (scm_t_array_handle *h, ssize_t idx0)
|
||||
{
|
||||
scm_t_array_dim *dim = scm_array_handle_dims (h);
|
||||
|
||||
if (scm_array_handle_rank (h) != 1)
|
||||
scm_misc_error (NULL, "wrong number of indices, expecting ~A",
|
||||
scm_list_1 (scm_from_size_t (scm_array_handle_rank (h))));
|
||||
|
||||
check_array_index_bounds (&dim[0], idx0);
|
||||
|
||||
return (idx0 - dim[0].lbnd) * dim[0].inc;
|
||||
}
|
||||
|
||||
ssize_t
|
||||
scm_array_handle_pos_2 (scm_t_array_handle *h, ssize_t idx0, ssize_t idx1)
|
||||
{
|
||||
scm_t_array_dim *dim = scm_array_handle_dims (h);
|
||||
|
||||
if (scm_array_handle_rank (h) != 2)
|
||||
scm_misc_error (NULL, "wrong number of indices, expecting ~A",
|
||||
scm_list_1 (scm_from_size_t (scm_array_handle_rank (h))));
|
||||
|
||||
check_array_index_bounds (&dim[0], idx0);
|
||||
check_array_index_bounds (&dim[1], idx1);
|
||||
|
||||
return ((idx0 - dim[0].lbnd) * dim[0].inc
|
||||
+ (idx1 - dim[1].lbnd) * dim[1].inc);
|
||||
}
|
||||
|
||||
SCM
|
||||
scm_array_handle_element_type (scm_t_array_handle *h)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -114,6 +114,8 @@ typedef struct scm_t_array_handle {
|
|||
|
||||
SCM_API void scm_array_get_handle (SCM array, scm_t_array_handle *h);
|
||||
SCM_API ssize_t scm_array_handle_pos (scm_t_array_handle *h, SCM indices);
|
||||
SCM_API ssize_t scm_array_handle_pos_1 (scm_t_array_handle *h, ssize_t idx0);
|
||||
SCM_API ssize_t scm_array_handle_pos_2 (scm_t_array_handle *h, ssize_t idx0, ssize_t idx1);
|
||||
SCM_API SCM scm_array_handle_element_type (scm_t_array_handle *h);
|
||||
SCM_API void scm_array_handle_release (scm_t_array_handle *h);
|
||||
SCM_API const SCM* scm_array_handle_elements (scm_t_array_handle *h);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010, 2013 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
|
||||
|
|
@ -33,6 +33,12 @@
|
|||
#include "libguile/generalized-arrays.h"
|
||||
|
||||
|
||||
SCM_INTERNAL SCM scm_i_array_ref (SCM v,
|
||||
SCM idx0, SCM idx1, SCM idxN);
|
||||
SCM_INTERNAL SCM scm_i_array_set_x (SCM v, SCM obj,
|
||||
SCM idx0, SCM idx1, SCM idxN);
|
||||
|
||||
|
||||
int
|
||||
scm_is_array (SCM obj)
|
||||
{
|
||||
|
|
@ -195,11 +201,35 @@ SCM_DEFINE (scm_array_in_bounds_p, "array-in-bounds?", 1, 0, 1,
|
|||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_array_ref, "array-ref", 1, 0, 1,
|
||||
(SCM v, SCM args),
|
||||
"Return the element at the @code{(index1, index2)} element in\n"
|
||||
"array @var{v}.")
|
||||
#define FUNC_NAME s_scm_array_ref
|
||||
|
||||
SCM
|
||||
scm_c_array_ref_1 (SCM array, ssize_t idx0)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
SCM res;
|
||||
|
||||
scm_array_get_handle (array, &handle);
|
||||
res = scm_array_handle_ref (&handle, scm_array_handle_pos_1 (&handle, idx0));
|
||||
scm_array_handle_release (&handle);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
SCM
|
||||
scm_c_array_ref_2 (SCM array, ssize_t idx0, ssize_t idx1)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
SCM res;
|
||||
|
||||
scm_array_get_handle (array, &handle);
|
||||
res = scm_array_handle_ref (&handle, scm_array_handle_pos_2 (&handle, idx0, idx1));
|
||||
scm_array_handle_release (&handle);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
SCM
|
||||
scm_array_ref (SCM v, SCM args)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
SCM res;
|
||||
|
|
@ -209,15 +239,34 @@ SCM_DEFINE (scm_array_ref, "array-ref", 1, 0, 1,
|
|||
scm_array_handle_release (&handle);
|
||||
return res;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
||||
SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
|
||||
(SCM v, SCM obj, SCM args),
|
||||
"Set the element at the @code{(index1, index2)} element in array\n"
|
||||
"@var{v} to @var{obj}. The value returned by @code{array-set!}\n"
|
||||
"is unspecified.")
|
||||
#define FUNC_NAME s_scm_array_set_x
|
||||
void
|
||||
scm_c_array_set_1_x (SCM array, SCM obj, ssize_t idx0)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
|
||||
scm_array_get_handle (array, &handle);
|
||||
scm_array_handle_set (&handle, scm_array_handle_pos_1 (&handle, idx0),
|
||||
obj);
|
||||
scm_array_handle_release (&handle);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
scm_c_array_set_2_x (SCM array, SCM obj, ssize_t idx0, ssize_t idx1)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
|
||||
scm_array_get_handle (array, &handle);
|
||||
scm_array_handle_set (&handle, scm_array_handle_pos_2 (&handle, idx0, idx1),
|
||||
obj);
|
||||
scm_array_handle_release (&handle);
|
||||
}
|
||||
|
||||
|
||||
SCM
|
||||
scm_array_set_x (SCM v, SCM obj, SCM args)
|
||||
{
|
||||
scm_t_array_handle handle;
|
||||
|
||||
|
|
@ -226,8 +275,47 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
|
|||
scm_array_handle_release (&handle);
|
||||
return SCM_UNSPECIFIED;
|
||||
}
|
||||
|
||||
|
||||
SCM_DEFINE (scm_i_array_ref, "array-ref", 1, 2, 1,
|
||||
(SCM v, SCM idx0, SCM idx1, SCM idxN),
|
||||
"Return the element at the @code{(idx0, idx1, idxN...)}\n"
|
||||
"position in array @var{v}.")
|
||||
#define FUNC_NAME s_scm_i_array_ref
|
||||
{
|
||||
if (SCM_UNBNDP (idx0))
|
||||
return scm_array_ref (v, SCM_EOL);
|
||||
else if (SCM_UNBNDP (idx1))
|
||||
return scm_c_array_ref_1 (v, scm_to_ssize_t (idx0));
|
||||
else if (scm_is_null (idxN))
|
||||
return scm_c_array_ref_2 (v, scm_to_ssize_t (idx0), scm_to_ssize_t (idx1));
|
||||
else
|
||||
return scm_array_ref (v, scm_cons (idx0, scm_cons (idx1, idxN)));
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
||||
SCM_DEFINE (scm_i_array_set_x, "array-set!", 2, 2, 1,
|
||||
(SCM v, SCM obj, SCM idx0, SCM idx1, SCM idxN),
|
||||
"Set the element at the @code{(idx0, idx1, idxN...)} position\n"
|
||||
"in the array @var{v} to @var{obj}. The value returned by\n"
|
||||
"@code{array-set!} is unspecified.")
|
||||
#define FUNC_NAME s_scm_i_array_set_x
|
||||
{
|
||||
if (SCM_UNBNDP (idx0))
|
||||
scm_array_set_x (v, obj, SCM_EOL);
|
||||
else if (SCM_UNBNDP (idx1))
|
||||
scm_c_array_set_1_x (v, obj, scm_to_ssize_t (idx0));
|
||||
else if (scm_is_null (idxN))
|
||||
scm_c_array_set_2_x (v, obj, scm_to_ssize_t (idx0), scm_to_ssize_t (idx1));
|
||||
else
|
||||
scm_array_set_x (v, obj, scm_cons (idx0, scm_cons (idx1, idxN)));
|
||||
|
||||
return SCM_UNSPECIFIED;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
||||
static SCM
|
||||
array_to_list (scm_t_array_handle *h, size_t dim, unsigned long pos)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#ifndef SCM_GENERALIZED_ARRAYS_H
|
||||
#define SCM_GENERALIZED_ARRAYS_H
|
||||
|
||||
/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009, 2013 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
|
||||
|
|
@ -48,6 +48,12 @@ SCM_API SCM scm_array_dimensions (SCM ra);
|
|||
SCM_API SCM scm_array_type (SCM ra);
|
||||
SCM_API SCM scm_array_in_bounds_p (SCM v, SCM args);
|
||||
|
||||
SCM_API SCM scm_c_array_ref_1 (SCM v, ssize_t idx0);
|
||||
SCM_API SCM scm_c_array_ref_2 (SCM v, ssize_t idx0, ssize_t idx1);
|
||||
|
||||
SCM_API void scm_c_array_set_1_x (SCM v, SCM obj, ssize_t idx0);
|
||||
SCM_API void scm_c_array_set_2_x (SCM v, SCM obj, ssize_t idx0, ssize_t idx1);
|
||||
|
||||
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_to_list (SCM v);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;;; unif.test --- tests guile's uniform arrays -*- scheme -*-
|
||||
;;;;
|
||||
;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
||||
;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012, 2013 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
|
||||
|
|
@ -451,7 +451,7 @@
|
|||
(array-set! a 'y 2))
|
||||
(pass-if-exception "end+1" exception:out-of-range
|
||||
(array-set! a 'y 6))
|
||||
(pass-if-exception "two indexes" exception:out-of-range
|
||||
(pass-if-exception "two indexes" exception:wrong-num-indices
|
||||
(array-set! a 'y 6 7))))
|
||||
|
||||
(with-test-prefix "two dim"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue