From 65704b982dcc9758d5e5a5452832a43a1ec453d6 Mon Sep 17 00:00:00 2001 From: Daniel Llorens Date: Fri, 19 Sep 2014 14:48:22 +0200 Subject: Pack array dimensions in array object * libguile/arrays.c (scm_i_make_array): redo object layout. * libguile/arrays.h (SCM_I_ARRAY_V, SCM_ARRAY_BASE, SCM_I_ARRAY_DIMS): to match new layout. (SCM_I_ARRAY_SET_V, SCM_ARRAY_SET_BASE): new setters. (SCM_I_ARRAY_MEM, scm_i_t_array): unused, remove. (scm_i_shap2ra, scm_make_typed_array, scm_from_contiguous_typed_array, scm_from_contiguous_array, scm_make_shared_array, scm_transpose_array, scm_array_contents): fix uses of SCM_I_ARRAY_V, SCM_ARRAY_BASE as lvalues. * libguile/array-map.c (make1array, scm_ramapc): fix uses of SCM_I_ARRAY_V, SCM_ARRAY_BASE as lvalues. --- libguile/array-map.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libguile/array-map.c') diff --git a/libguile/array-map.c b/libguile/array-map.c index 2d68f5f4a..938f0a7b9 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -1,6 +1,6 @@ /* Copyright (C) 1996, 1998, 2000, 2001, 2004, 2005, 2006, 2008, 2009, * 2010, 2011, 2012, 2013, 2014 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 @@ -63,11 +63,11 @@ static SCM make1array (SCM v, ssize_t inc) { SCM a = scm_i_make_array (1); - SCM_I_ARRAY_BASE (a) = 0; + SCM_I_ARRAY_SET_BASE (a, 0); SCM_I_ARRAY_DIMS (a)->lbnd = 0; SCM_I_ARRAY_DIMS (a)->ubnd = scm_c_array_length (v) - 1; SCM_I_ARRAY_DIMS (a)->inc = inc; - SCM_I_ARRAY_V (a) = v; + SCM_I_ARRAY_SET_V (a, v); return a; } @@ -195,9 +195,9 @@ scm_ramapc (void *cproc_ptr, SCM data, SCM ra0, SCM lra, const char *what) if (k == kroll) { SCM y = lra; - SCM_I_ARRAY_BASE (va0) = cindk (ra0, vi, kroll); + SCM_I_ARRAY_SET_BASE (va0, cindk (ra0, vi, kroll)); for (z = lva; !scm_is_null (z); z = SCM_CDR (z), y = SCM_CDR (y)) - SCM_I_ARRAY_BASE (SCM_CAR (z)) = cindk (SCM_CAR (y), vi, kroll); + SCM_I_ARRAY_SET_BASE (SCM_CAR (z), cindk (SCM_CAR (y), vi, kroll)); if (! (SCM_UNBNDP (data) ? cproc (va0, lva) : cproc (va0, data, lva))) return 0; --k; @@ -815,7 +815,7 @@ array_compare (scm_t_array_handle *hx, scm_t_array_handle *hy, return 0; i = hx->dims[dim].ubnd - hx->dims[dim].lbnd + 1; - + incx = hx->dims[dim].inc; incy = hy->dims[dim].inc; posx += (i - 1) * incx; @@ -832,11 +832,11 @@ SCM scm_array_equal_p (SCM x, SCM y) { scm_t_array_handle hx, hy; - SCM res; - + SCM res; + scm_array_get_handle (x, &hx); scm_array_get_handle (y, &hy); - + res = scm_from_bool (hx.ndims == hy.ndims && hx.element_type == hy.element_type); @@ -860,7 +860,7 @@ SCM_DEFINE (scm_i_array_equal_p, "array-equal?", 0, 2, 1, { if (SCM_UNBNDP (ra0) || SCM_UNBNDP (ra1)) return SCM_BOOL_T; - + while (!scm_is_null (rest)) { if (scm_is_false (scm_array_equal_p (ra0, ra1))) return SCM_BOOL_F; -- cgit v1.2.3