[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-148-g7aec4ce

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=7aec4ce019555b0c7113c585fda4a7ef18b84b5a

The branch, master has been updated
       via  7aec4ce019555b0c7113c585fda4a7ef18b84b5a (commit)
       via  0d782201bf5c23725db77c3d3d0e9bd959b1268d (commit)
      from  e30f5b7d4032f79eb3ecdb0a11de37486221845c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7aec4ce019555b0c7113c585fda4a7ef18b84b5a
Author: Andy Wingo <address@hidden>
Date:   Tue Jan 12 20:15:36 2010 +0100

    allow simple value definitions with define*-public
    
    * module/ice-9/optargs.scm (define*-public): Allow (define*-public ID
      VAL).

commit 0d782201bf5c23725db77c3d3d0e9bd959b1268d
Author: Andy Wingo <address@hidden>
Date:   Tue Jan 12 20:14:06 2010 +0100

    hopefully fix shared c32 / c64 uniform arrays
    
    * libguile/srfi-4.c (DEFINE_SRFI_4_C_FUNCS): Add a width parameter,
      indicating the number of sizeof(ctype) entries comprised by one
      element of the uniform; normally 1, but 2 for c32 and c64.

-----------------------------------------------------------------------

Summary of changes:
 libguile/srfi-4.c        |   34 +++++++++++++++++-----------------
 module/ice-9/optargs.scm |   11 +++++++----
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index f9572d0..005a5a0 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -110,7 +110,7 @@
 #define ETYPE(TAG) \
   SCM_ARRAY_ELEMENT_TYPE_##TAG
 
-#define DEFINE_SRFI_4_C_FUNCS(TAG, tag, ctype)                          \
+#define DEFINE_SRFI_4_C_FUNCS(TAG, tag, ctype, width)                   \
   SCM scm_take_##tag##vector (ctype *data, size_t n)                    \
   {                                                                     \
     return scm_c_take_typed_bytevector ((scm_t_int8*)data, n, ETYPE (TAG));   \
@@ -119,13 +119,13 @@
   {                                                                     \
     if (h->element_type != ETYPE (TAG))                                 \
       scm_wrong_type_arg_msg (NULL, 0, h->array, #tag "vector");        \
-    return ((const ctype*) h->elements) + h->base;                      \
+    return ((const ctype*) h->elements) + h->base*width;                \
   }                                                                     \
   ctype* scm_array_handle_##tag##_writable_elements (scm_t_array_handle *h) \
   {                                                                     \
     if (h->element_type != ETYPE (TAG))                                 \
       scm_wrong_type_arg_msg (NULL, 0, h->array, #tag "vector");        \
-    return ((ctype*) h->writable_elements) + h->base;                   \
+    return ((ctype*) h->writable_elements) + h->base*width;             \
   }                                                                     \
   const ctype *scm_##tag##vector_elements (SCM uvec,                    \
                                            scm_t_array_handle *h,       \
@@ -139,7 +139,7 @@
   {                                                                     \
     scm_uniform_vector_elements (uvec, h, lenp, incp);                  \
     if (h->element_type == ETYPE (TAG))                                 \
-      return ((ctype*)h->writable_elements) + h->base;                  \
+      return ((ctype*)h->writable_elements) + h->base*width;            \
     /* otherwise... */                                                  \
     else                                                                \
       {                                                                 \
@@ -161,7 +161,7 @@
         h->dim0.ubnd = h->dim0.lbnd + lto;                              \
         h->base = h->base * sto / sfrom;                                \
         h->element_type = ETYPE (TAG);                                  \
-        return ((ctype*)h->writable_elements) + h->base;                \
+        return ((ctype*)h->writable_elements) + h->base*width;          \
       }                                                                 \
   }
 
@@ -169,47 +169,47 @@
 #define MOD "srfi srfi-4"
 
 DEFINE_SRFI_4_PROXIES (u8);
-DEFINE_SRFI_4_C_FUNCS (U8, u8, scm_t_uint8);
+DEFINE_SRFI_4_C_FUNCS (U8, u8, scm_t_uint8, 1);
 
 DEFINE_SRFI_4_PROXIES (s8);
-DEFINE_SRFI_4_C_FUNCS (S8, s8, scm_t_int8);
+DEFINE_SRFI_4_C_FUNCS (S8, s8, scm_t_int8, 1);
 
 DEFINE_SRFI_4_PROXIES (u16);
-DEFINE_SRFI_4_C_FUNCS (U16, u16, scm_t_uint16);
+DEFINE_SRFI_4_C_FUNCS (U16, u16, scm_t_uint16, 1);
 
 DEFINE_SRFI_4_PROXIES (s16);
-DEFINE_SRFI_4_C_FUNCS (S16, s16, scm_t_int16);
+DEFINE_SRFI_4_C_FUNCS (S16, s16, scm_t_int16, 1);
 
 DEFINE_SRFI_4_PROXIES (u32);
-DEFINE_SRFI_4_C_FUNCS (U32, u32, scm_t_uint32);
+DEFINE_SRFI_4_C_FUNCS (U32, u32, scm_t_uint32, 1);
 
 DEFINE_SRFI_4_PROXIES (s32);
-DEFINE_SRFI_4_C_FUNCS (S32, s32, scm_t_int32);
+DEFINE_SRFI_4_C_FUNCS (S32, s32, scm_t_int32, 1);
 
 DEFINE_SRFI_4_PROXIES (u64);
 #if SCM_HAVE_T_INT64
-DEFINE_SRFI_4_C_FUNCS (U64, u64, scm_t_uint64);
+DEFINE_SRFI_4_C_FUNCS (U64, u64, scm_t_uint64, 1);
 #endif
 
 DEFINE_SRFI_4_PROXIES (s64);
 #if SCM_HAVE_T_INT64
-DEFINE_SRFI_4_C_FUNCS (S64, s64, scm_t_int64);
+DEFINE_SRFI_4_C_FUNCS (S64, s64, scm_t_int64, 1);
 #endif
 
 DEFINE_SRFI_4_PROXIES (f32);
-DEFINE_SRFI_4_C_FUNCS (F32, f32, float);
+DEFINE_SRFI_4_C_FUNCS (F32, f32, float, 1);
 
 DEFINE_SRFI_4_PROXIES (f64);
-DEFINE_SRFI_4_C_FUNCS (F64, f64, double);
+DEFINE_SRFI_4_C_FUNCS (F64, f64, double, 1);
 
 #undef MOD
 #define MOD "srfi srfi-4 gnu"
 
 DEFINE_SRFI_4_PROXIES (c32);
-DEFINE_SRFI_4_C_FUNCS (C32, c32, float);
+DEFINE_SRFI_4_C_FUNCS (C32, c32, float, 2);
 
 DEFINE_SRFI_4_PROXIES (c64);
-DEFINE_SRFI_4_C_FUNCS (C64, c64, double);
+DEFINE_SRFI_4_C_FUNCS (C64, c64, double, 2);
 
 #define DEFINE_SRFI_4_GNU_PROXIES(tag)                              \
   DEFPROXY100 (scm_any_to_##tag##vector, "any->" #tag "vector")
diff --git a/module/ice-9/optargs.scm b/module/ice-9/optargs.scm
index 06e2a16..4e3267d 100644
--- a/module/ice-9/optargs.scm
+++ b/module/ice-9/optargs.scm
@@ -1,6 +1,6 @@
 ;;;; optargs.scm -- support for optional arguments
 ;;;;
-;;;;   Copyright (C) 1997, 1998, 1999, 2001, 2002, 2004, 2006, 2009 Free 
Software Foundation, Inc.
+;;;;   Copyright (C) 1997, 1998, 1999, 2001, 2002, 2004, 2006, 2009, 2010 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
@@ -253,9 +253,12 @@
 ;; in the same way as lambda*.
 
 (define-syntax define*-public
-  (syntax-rules ()
-    ((_ (id . args) b0 b1 ...)
-     (define-public id (lambda* args b0 b1 ...)))))
+  (lambda (x)
+    (syntax-case x ()
+      ((_ (id . args) b0 b1 ...)
+       #'(define-public id (lambda* args b0 b1 ...)))
+      ((_ id val) (identifier? #'id)
+       #'(define-public id val)))))
 
 
 ;; defmacro* name args . body


hooks/post-receive
-- 
GNU Guile