From 25645a0ac9158916667588b76cd541ee9dc05132 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 23 Jan 2013 17:27:50 -0500 Subject: [PATCH] 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. --- 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 5dfa8c0a9..139c02b6c 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 d41a0eb96..4abd3c935 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)