guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-177-g5765c


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-177-g5765c5a
Date: Mon, 23 Jan 2012 22:51:59 +0000

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=5765c5a82ce3891faff02c0bcc603cc0fe5ae36d

The branch, stable-2.0 has been updated
       via  5765c5a82ce3891faff02c0bcc603cc0fe5ae36d (commit)
       via  c64d07d822f44f5917ee9b90956bb8ed5bb716fd (commit)
      from  21ad60a1d29032ab5f2a9d798ced9d1a1a8420b2 (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 5765c5a82ce3891faff02c0bcc603cc0fe5ae36d
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 23 23:51:33 2012 +0100

    FFI: Fix `set-pointer-finalizer!' to leave the type cell unchanged.
    
    This is a followup to 690a0112e55823aa8b862daeddcf44cea97e7917 ("Remove
    the "has finalizer?" bit from pointer objects.")
    
    * libguile/foreign.c (scm_set_pointer_finalizer_x): Leave the type cell
      unchanged.  Before, `equal?' would break on pointers on which
      `set-pointer-finalizer!' had been called.
    
    * test-suite/tests/foreign.test ("make-pointer")["equal? modulo
      finalizer (set-pointer-finalizer!)"]: New test.

commit c64d07d822f44f5917ee9b90956bb8ed5bb716fd
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 23 23:40:54 2012 +0100

    guile-readline: Clean `.go' files.
    
    * guile-readline/Makefile.am (CLEANFILES): Add *.go.

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

Summary of changes:
 guile-readline/Makefile.am    |    5 +++--
 libguile/foreign.c            |    2 --
 test-suite/tests/foreign.test |    8 +++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index f9d51a2..0c4ca77 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 
2010 Free Software Foundation, Inc.
+##   Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008,
+##     2009, 2010, 2012 Free Software Foundation, Inc.
 ##
 ##   This file is part of guile-readline.
 ##
@@ -68,7 +69,7 @@ EXTRA_DIST += LIBGUILEREADLINE-VERSION ChangeLog-2008
 ETAGS_ARGS +=                                                  \
   $(address@hidden@_la_SOURCES)
 
-CLEANFILES += *.x
+CLEANFILES += *.x *.go
 
 endif HAVE_READLINE
 
diff --git a/libguile/foreign.c b/libguile/foreign.c
index f8c268d..0dc7ac6 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -319,8 +319,6 @@ SCM_DEFINE (scm_set_pointer_finalizer_x, 
"set-pointer-finalizer!", 2, 0, 0,
 
   c_finalizer = SCM_POINTER_VALUE (finalizer);
 
-  SCM_SET_CELL_WORD_0 (pointer, SCM_CELL_WORD_0 (pointer) | (1 << 16UL));
-
   GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (pointer),
                                   pointer_finalizer_trampoline,
                                   c_finalizer,
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test
index 2c326c9..6eafe95 100644
--- a/test-suite/tests/foreign.test
+++ b/test-suite/tests/foreign.test
@@ -1,6 +1,6 @@
 ;;;; foreign.test --- FFI.           -*- mode: scheme; coding: utf-8; -*-
 ;;;;
-;;;;   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2010, 2011, 2012 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
@@ -71,6 +71,12 @@
       (equal? (make-pointer 123)
               (make-pointer 123 finalizer))))
 
+  (pass-if "equal? modulo finalizer (set-pointer-finalizer!)"
+    (let ((finalizer (dynamic-func "scm_is_pair" (dynamic-link)))
+          (ptr       (make-pointer 123)))
+      (set-pointer-finalizer! ptr finalizer)
+      (equal? (make-pointer 123) ptr)))
+
   (pass-if "not equal?"
     (not (equal? (make-pointer 123) (make-pointer 456)))))
 


hooks/post-receive
-- 
GNU Guile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]