[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 21/47: psyntax: Fix bug in match-each+.
From: |
Andy Wingo |
Subject: |
[Guile-commits] 21/47: psyntax: Fix bug in match-each+. |
Date: |
Sun, 22 May 2016 18:23:04 +0000 (UTC) |
wingo pushed a commit to branch master
in repository guile.
commit bb7075dc1a9084305160b690ad918cf98401e1dd
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 0d30b7c..3cd6035 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -2509,7 +2509,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 0bc6024..a45353a 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -2849,7 +2849,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)))))))
- [Guile-commits] 46/47: doc: Fix typo in Web documentation., (continued)
- [Guile-commits] 46/47: doc: Fix typo in Web documentation., Andy Wingo, 2016/05/22
- [Guile-commits] 44/47: Bump user-visible copyright years to 2016., Andy Wingo, 2016/05/22
- [Guile-commits] 03/47: Implement 'string-utf8-length' and 'scm_c_string_utf8_length'., Andy Wingo, 2016/05/22
- [Guile-commits] 12/47: doc: Update libgc URL., Andy Wingo, 2016/05/22
- [Guile-commits] 09/47: Work around requirement that size be non-zero in GDB 'open-memory'., Andy Wingo, 2016/05/22
- [Guile-commits] 07/47: Correct docstring of 'symlink'., Andy Wingo, 2016/05/22
- [Guile-commits] 11/47: Add more R6RS port encoding tests, Andy Wingo, 2016/05/22
- [Guile-commits] 01/47: tests: Use 'pass-if-equal' in web-http chunked encoding tests., Andy Wingo, 2016/05/22
- [Guile-commits] 13/47: Fix typo in manual., Andy Wingo, 2016/05/22
- [Guile-commits] 19/47: Fix uses of 'scm_gc_protect', which does not exist, in the manual., Andy Wingo, 2016/05/22
- [Guile-commits] 21/47: psyntax: Fix bug in match-each+.,
Andy Wingo <=
- [Guile-commits] 15/47: i18n: Check for non-POSIX strtol_l., Andy Wingo, 2016/05/22
- [Guile-commits] 28/47: i18n: Add new collation test for posterity., Andy Wingo, 2016/05/22
- [Guile-commits] 05/47: tests: Make 'test-guild-compile' more reliable., Andy Wingo, 2016/05/22
- [Guile-commits] 32/47: Remove SIGEV constant definitions., Andy Wingo, 2016/05/22
- [Guile-commits] 04/47: Don't return expressions from void functions in numbers.c, Andy Wingo, 2016/05/22
- [Guile-commits] 31/47: Add Hurd signal and error constants., Andy Wingo, 2016/05/22
- [Guile-commits] 08/47: web: Export 'server-impl' procedures and the 'http' server implementation., Andy Wingo, 2016/05/22
- [Guile-commits] 39/47: Bump user-visible copyright years to 2015., Andy Wingo, 2016/05/22
- [Guile-commits] 43/47: SRFI-19: Update the table of leap seconds., Andy Wingo, 2016/05/22
- [Guile-commits] 41/47: http: Accept empty reason phrases., Andy Wingo, 2016/05/22