From 2c8cb7dda2a945cd69b66049075f874849ac2cd9 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Sat, 28 Jun 2008 03:16:21 -0700 Subject: [PATCH] fixed a bug in matching library subversion in psyntax. --- scheme/last-revision | 2 +- scheme/psyntax.expander.ss | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scheme/last-revision b/scheme/last-revision index d2a3f63..641d5f5 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1523 +1524 diff --git a/scheme/psyntax.expander.ss b/scheme/psyntax.expander.ss index d8f99e9..485755f 100644 --- a/scheme/psyntax.expander.ss +++ b/scheme/psyntax.expander.ss @@ -29,7 +29,6 @@ interaction-environment ellipsis-map) (import - (only (ikarus) printf) (except (rnrs) environment environment? identifier? eval generate-temporaries free-identifier=? @@ -3292,14 +3291,14 @@ (lambda (x) (not (p x))))] [(sub* ...) (let ([p* (map subversion-pred sub*)]) - (lambda (x) + (lambda (x) (let f ([p* p*] [x x]) (cond [(null? p*) #t] [(null? x) #f] [else - (and ((car p*) (car x)) - (f (cdr p*) (cdr x*)))]))))] + (and ((car p*) (car x)) + (f (cdr p*) (cdr x)))]))))] [_ (syntax-violation 'import "invalid version spec" spec x*)])) (let f ([x spec]) (syntax-match x ()