[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-59-g25645a0

[Mark H Weaver]

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=25645a0ac9158916667588b76cd541ee9dc05132

The branch, stable-2.0 has been updated
       via  25645a0ac9158916667588b76cd541ee9dc05132 (commit)
      from  b34e25359aad4a08e15de8c5a150ebcff55ff7c1 (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 25645a0ac9158916667588b76cd541ee9dc05132
Author: Mark H Weaver <address@hidden>
Date:   Wed Jan 23 17:27:50 2013 -0500

    Fix source annotation bug in psyntax 'expand-body'.
    
    * module/ice-9/psyntax.scm (expand-body): Apply source-annotation to an
      expression, not to the expression's compile-time environment.
    
    * module/ice-9/psyntax-pp.scm: Regenerate.

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

Summary of changes:
 module/ice-9/psyntax-pp.scm |    2 +-
 module/ice-9/psyntax.scm    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index 5dfa8c0..139c02b 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -976,7 +976,7 @@
              (let ((e (cdar body)) (er (caar body)))
                (call-with-values
                  (lambda ()
-                   (syntax-type e er '(()) (source-annotation er) ribcage mod 
#f))
+                   (syntax-type e er '(()) (source-annotation e) ribcage mod 
#f))
                  (lambda (type value form e w s mod)
                    (let ((key type))
                      (cond ((memv key '(define-form))
diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index d41a0eb..4abd3c9 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -1457,7 +1457,7 @@
                 (syntax-violation #f "no expressions in body" outer-form)
                 (let ((e (cdar body)) (er (caar body)))
                   (call-with-values
-                      (lambda () (syntax-type e er empty-wrap 
(source-annotation er) ribcage mod #f))
+                      (lambda () (syntax-type e er empty-wrap 
(source-annotation e) ribcage mod #f))
                     (lambda (type value form e w s mod)
                       (case type
                         ((define-form)


hooks/post-receive
-- 
GNU Guile