diff options
author | Andy Wingo <wingo@pobox.com> | 2013-02-18 12:46:00 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-02-18 12:46:00 +0100 |
commit | 18cd9aff9429c99ffae34448507f9b468e20e06f (patch) | |
tree | 90bff712b74c1b67f3f5ef6c3f73da23b9ca07b3 /libguile/inline.h | |
parent | 3330f00f54649cdd0914b6ff03c7b7bbc38ffa8d (diff) | |
download | guile-18cd9aff9429c99ffae34448507f9b468e20e06f.tar.gz |
array handle inline functions defined in array-handle.h.
* libguile/inline.h:
* libguile/array-handle.h (scm_array_handle_ref):
(scm_array_handle_set): Move definitions here from inline.h.
* libguile/inline.c: Include array-handle.h.
Diffstat (limited to 'libguile/inline.h')
-rw-r--r-- | libguile/inline.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/libguile/inline.h b/libguile/inline.h index 6b1cf5e77..88ba7f747 100644 --- a/libguile/inline.h +++ b/libguile/inline.h @@ -4,7 +4,7 @@ #define SCM_INLINE_H /* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, - * 2011 Free Software Foundation, Inc. + * 2011, 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 @@ -41,9 +41,6 @@ #include "libguile/error.h" -SCM_INLINE SCM scm_array_handle_ref (scm_t_array_handle *h, ssize_t pos); -SCM_INLINE void scm_array_handle_set (scm_t_array_handle *h, ssize_t pos, SCM val); - SCM_INLINE int scm_is_pair (SCM x); SCM_INLINE int scm_is_string (SCM x); @@ -61,26 +58,6 @@ SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint16 n_words); #if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES /* Either inlining, or being included from inline.c. */ -SCM_INLINE_IMPLEMENTATION SCM -scm_array_handle_ref (scm_t_array_handle *h, ssize_t p) -{ - if (SCM_UNLIKELY (p < 0 && ((size_t)-p) > h->base)) - /* catch overflow */ - scm_out_of_range (NULL, scm_from_ssize_t (p)); - /* perhaps should catch overflow here too */ - return h->impl->vref (h, h->base + p); -} - -SCM_INLINE_IMPLEMENTATION void -scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v) -{ - if (SCM_UNLIKELY (p < 0 && ((size_t)-p) > h->base)) - /* catch overflow */ - scm_out_of_range (NULL, scm_from_ssize_t (p)); - /* perhaps should catch overflow here too */ - h->impl->vset (h, h->base + p, v); -} - SCM_INLINE_IMPLEMENTATION int scm_is_pair (SCM x) { |