From ae9df5db7a24ae67e601099149cf24a2557d1187 Mon Sep 17 00:00:00 2001
From: Chongkai Zhu <chongkai@racket-lang.org>
Date: Sun, 1 Apr 2007 01:38:00 +0000
Subject: [PATCH] fix bug report 8591

svn: r5852
---
 collects/srfi/71.ss                      | 14 ++++++++------
 collects/srfi/71/letvalues.ss            | 22 +++++++++++-----------
 collects/srfi/86/86.ss                   |  4 +++-
 collects/srfi/mzscheme-for-srfi-71-86.ss |  3 ---
 4 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 collects/srfi/mzscheme-for-srfi-71-86.ss

diff --git a/collects/srfi/71.ss b/collects/srfi/71.ss
index d4a5ff3329..24c31bd4f6 100644
--- a/collects/srfi/71.ss
+++ b/collects/srfi/71.ss
@@ -2,12 +2,14 @@
 (module |71| mzscheme
   (require (lib "letvalues.ss" "srfi" "71"))
   (provide (all-from-except (lib "letvalues.ss" "srfi" "71")
+                            let
+                            let*
+                            letrec
                             srfi-let
                             srfi-let*
-                            srfi-letrec
-                            srfi-letrec*)
-           (rename srfi-let     let)
-           (rename srfi-let*    let*)
-           (rename srfi-letrec  letrec)
-           (rename srfi-letrec* letrec*)))
+                            srfi-letrec))
+  (provide (rename srfi-let    let)
+           (rename srfi-let*   let*)
+           (rename srfi-letrec letrec)
+           (rename srfi-letrec letrec*)))
   
\ No newline at end of file
diff --git a/collects/srfi/71/letvalues.ss b/collects/srfi/71/letvalues.ss
index 0990d80b27..aa4d26b030 100644
--- a/collects/srfi/71/letvalues.ss
+++ b/collects/srfi/71/letvalues.ss
@@ -1,9 +1,9 @@
-; Based on Sebastian's reference implementation
-; of SRFI-71 using PLT 208's modules
+; Reference implementation of SRFI-71 using PLT 208's modules
+; Sebastian.Egner@philips.com, 29-Apr-2005
 
-(module letvalues (lib "mzscheme-for-srfi-71-86.ss" "srfi")
+(module letvalues mzscheme
   
-  ;(provide (all-from-except mzscheme let let* letrec))
+  (provide (all-from mzscheme))
   
   (provide srfi-let
            srfi-let*
@@ -195,25 +195,25 @@
   ; --- standard procedures ---
   
   (define (uncons pair)
-    (s:values (car pair) (cdr pair)))
+    (values (car pair) (cdr pair)))
   
   (define (uncons-2 list)
-    (s:values (car list) (cadr list) (cddr list)))
+    (values (car list) (cadr list) (cddr list)))
   
   (define (uncons-3 list)
-    (s:values (car list) (cadr list) (caddr list) (cdddr list)))
+    (values (car list) (cadr list) (caddr list) (cdddr list)))
   
   (define (uncons-4 list)
-    (s:values (car list) (cadr list) (caddr list) (cadddr list) (cddddr list)))
+    (values (car list) (cadr list) (caddr list) (cadddr list) (cddddr list)))
   
   (define (uncons-cons alist)
-    (s:values (caar alist) (cdar alist) (cdr alist)))
+    (values (caar alist) (cdar alist) (cdr alist)))
   
   (define (unlist list)
-    (apply s:values list))
+    (apply values list))
   
   (define (unvector vector)
-    (apply s:values (vector->list vector)))
+    (apply values (vector->list vector)))
   
   ; --- standard macros ---
   
diff --git a/collects/srfi/86/86.ss b/collects/srfi/86/86.ss
index 0843cfacfe..0ddfde2506 100644
--- a/collects/srfi/86/86.ss
+++ b/collects/srfi/86/86.ss
@@ -1,4 +1,6 @@
-(module |86| (lib "mzscheme-for-srfi-71-86.ss" "srfi")
+(module |86| mzscheme
+  
+  (provide (all-from mzscheme))
   
   (provide mu nu
            alet alet*)
diff --git a/collects/srfi/mzscheme-for-srfi-71-86.ss b/collects/srfi/mzscheme-for-srfi-71-86.ss
deleted file mode 100644
index 13f4eb06c1..0000000000
--- a/collects/srfi/mzscheme-for-srfi-71-86.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module mzscheme-for-srfi-71-86 mzscheme
-  (provide (all-from-except mzscheme values))
-  (provide (rename values s:values)))
\ No newline at end of file