[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: psyntax: Fix bug in match-each+.
From: |
Mark H. Weaver |
Subject: |
[Guile-commits] 01/01: psyntax: Fix bug in match-each+. |
Date: |
Thu, 03 Sep 2015 07:01:30 +0000 |
mhw pushed a commit to branch stable-2.0
in repository guile.
commit 3bda6eb9dfb14cf088e58de99825296a171ff4bf
Author: Mark H Weaver <address@hidden>
Date: Thu Sep 3 02:51:00 2015 -0400
psyntax: Fix bug in match-each+.
Reported by Panicz Maciej Godek <address@hidden> in
<http://lists.gnu.org/archive/html/guile-user/2015-09/msg00017.html>.
* module/ice-9/psyntax.scm (match-each+): Fix the case where a non-pair
syntax object is encountered in a dotted tail.
* module/ice-9/psyntax-pp.scm: Regenerate.
---
module/ice-9/psyntax-pp.scm | 3 ++-
module/ice-9/psyntax.scm | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index d6547aa..1ec5107 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -2451,7 +2451,8 @@
(values '() (cdr y-pat) (match (car e) (car y-pat) w
r mod)))
(values #f #f #f)))))
((syntax-object? e)
- (f (syntax-object-expression e) (join-wraps w e)))
+ (f (syntax-object-expression e)
+ (join-wraps w (syntax-object-wrap e))))
(else (values '() y-pat (match e z-pat w r mod)))))))
(match-each-any
(lambda (e w mod)
diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index 5a805c5..79b353d 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -2725,7 +2725,8 @@
(match (car e) (car y-pat) w r mod)))
(values #f #f #f)))))
((syntax-object? e)
- (f (syntax-object-expression e) (join-wraps w e)))
+ (f (syntax-object-expression e)
+ (join-wraps w (syntax-object-wrap e))))
(else
(values '() y-pat (match e z-pat w r mod)))))))