diff options
author | Andy Wingo <wingo@pobox.com> | 2013-02-18 16:38:24 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-02-18 16:38:24 +0100 |
commit | 336c921146957a7416bc1717289a01f1b556ad82 (patch) | |
tree | a06277914da095c42005622e45997d5ae8b3b3a4 /libguile/generalized-arrays.h | |
parent | 18cd9aff9429c99ffae34448507f9b468e20e06f (diff) | |
download | guile-336c921146957a7416bc1717289a01f1b556ad82.tar.gz |
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.
Diffstat (limited to 'libguile/generalized-arrays.h')
-rw-r--r-- | libguile/generalized-arrays.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libguile/generalized-arrays.h b/libguile/generalized-arrays.h index 1f9b6ad3d..2ad34a1d5 100644 --- a/libguile/generalized-arrays.h +++ b/libguile/generalized-arrays.h @@ -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); |