Fix bug in output of LETREC expressions: internal definitions within

the LETREC must be rewritten as a nested LETREC.  Previously they were
merged into the outer LETREC.

diff --git a/v7/src/runtime/syntax-output.scm b/v7/src/runtime/syntax-output.scm
index 53021bd48a24a6ed7e06be1e16cd0ef88729306f..4ae043c9a09e9fcad885203ee691c86005680f44 100644 (file)
--- a/v7/src/runtime/syntax-output.scm
+++ b/v7/src/runtime/syntax-output.scm
@@ -1,25 +1,26 @@
-;;; -*-Scheme-*-
-;;;
-;;; $Id: syntax-output.scm,v 14.6 2002/11/20 19:46:23 cph Exp $
-;;;
-;;; Copyright (c) 1989-1991, 2001, 2002 Massachusetts Institute of Technology
-;;;
-;;; This file is part of MIT Scheme.
-;;;
-;;; MIT Scheme is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published
-;;; by the Free Software Foundation; either version 2 of the License,
-;;; or (at your option) any later version.
-;;;
-;;; MIT Scheme is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with MIT Scheme; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;;; 02111-1307, USA.
+#| -*-Scheme-*-
+
+$Id: syntax-output.scm,v 14.7 2003/02/09 01:58:09 cph Exp $
+
+Copyright 1989,1990,1991,2001,2002,2003 Massachusetts Institute of Technology
+
+This file is part of MIT Scheme.
+
+MIT Scheme is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+MIT Scheme is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with MIT Scheme; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+|#
 
 ;;;; Syntaxer Output Interface
 
@@ -95,11 +96,19 @@
   (output/combination (output/named-lambda lambda-tag:let names body) values))
 
 (define (output/letrec names values body)
-  (output/let '() '()
-             (output/body '()
-                          (make-sequence
-                           (append! (map make-definition names values)
-                                    (list body))))))
+  (output/let names
+             (map (lambda (name) name (output/unassigned)) names)
+             (make-sequence
+              (map* (list (scan-defines body
+                            (lambda (names declarations body)
+                              (if (or (pair? names)
+                                      (pair? declarations))
+                                  (output/let '() '()
+                                              (make-open-block names
+                                                               declarations
+                                                               body))
+                                  body))))
+                    output/assignment names values))))
 
 (define (output/body declarations body)
   (scan-defines (let ((declarations (apply append declarations)))