Change nearly all code to use parameterize rather than parameterize*.
authorChris Hanson <org/chris-hanson/cph>
Wed, 13 Jun 2018 03:51:48 +0000 (20:51 -0700)
committerChris Hanson <org/chris-hanson/cph>
Wed, 13 Jun 2018 03:51:48 +0000 (20:51 -0700)
62 files changed:
src/6001/edextra.scm
src/6001/nodefs.scm
src/compiler/base/debug.scm
src/compiler/base/object.scm
src/compiler/base/toplev.scm
src/compiler/machines/i386/dassm1.scm
src/compiler/machines/svm/disassembler.scm
src/compiler/machines/x86-64/dassm1.scm
src/edwin/artdebug.scm
src/edwin/autold.scm
src/edwin/bufcom.scm
src/edwin/bufinp.scm
src/edwin/bufout.scm
src/edwin/debug.scm
src/edwin/editor.scm
src/edwin/evlcom.scm
src/edwin/eystep.scm
src/edwin/filcom.scm
src/edwin/hlpcom.scm
src/edwin/intmod.scm
src/edwin/prompt.scm
src/edwin/schmod.scm
src/edwin/winout.scm
src/ffi/build.scm
src/ffi/cdecls.scm
src/imail/imail-util.scm
src/runtime/advice.scm
src/runtime/command-line.scm
src/runtime/dbgutl.scm
src/runtime/debug.scm
src/runtime/error.scm
src/runtime/ffi.scm
src/runtime/file-io.scm
src/runtime/framex.scm
src/runtime/infutl.scm
src/runtime/load.scm
src/runtime/mit-macros.scm
src/runtime/ntdir.scm
src/runtime/option.scm
src/runtime/pp.scm
src/runtime/prgcop.scm
src/runtime/printer.scm
src/runtime/rep.scm
src/runtime/savres.scm
src/runtime/stack-sample.scm
src/runtime/string-io.scm
src/runtime/structure-parser.scm
src/runtime/swank.scm
src/runtime/syntax-rename.scm
src/runtime/syntax.scm
src/runtime/textual-port.scm
src/runtime/thread.scm
src/runtime/unsyn.scm
src/runtime/unxdir.scm
src/runtime/usrint.scm
src/runtime/world-report.scm
src/runtime/wrkdir.scm
src/sf/cgen.scm
src/sos/microbench.scm
src/ssp/xhtml-expander.scm
src/ssp/xmlrpc.scm
tests/unit-testing.scm

index 94546dca10b3460951acf6342684752c018daa0b..0f9cc47ab731dfa2c2adc23228e18466fd20c94a 100644 (file)
@@ -294,9 +294,8 @@ Now, there is formatting stuff to be considered here, in print-pgm.sh.
                (groups/files-to-copy groups)))))
 
 (define (load-quietly pathname environment)
-  (parameterize* (list (cons param:suppress-loading-message? #t))
-    (lambda ()
-      (load pathname environment))))
+  (parameterize ((param:suppress-loading-message? #t))
+    (load pathname environment)))
 
 (define (->string object)
   (if (string? object)
index 9e5b51c458baa58ee55038d287d154b4339cac4c..fe8c2901ccc63498474414b9dfa8b87376db675d 100644 (file)
@@ -79,8 +79,7 @@ USA.
      (if (not (default-object? value))
         (begin
           (write-string " --> " port)
-          (parameterize* (list (cons param:printer-list-depth-limit 2)
-                               (cons param:printer-list-breadth-limit 10)
-                               (cons param:printer-string-length-limit 30))
-            (lambda ()
-              (write value port))))))))
+          (parameterize ((param:printer-list-depth-limit 2)
+                         (param:printer-list-breadth-limit 10)
+                         (param:printer-string-length-limit 30))
+            (write value port)))))))
index 66af842e610acd847ea44dc6d445fd275f60a9b6..87cfe0daaab53ff74b0dc1e465b49019c9471842 100644 (file)
@@ -78,9 +78,8 @@ USA.
 (define (write-rtl-instructions rtl port)
   (write-instructions
    (lambda ()
-     (parameterize* (list (cons current-output-port port))
-       (lambda ()
-        (for-each show-rtl-instruction rtl))))))
+     (parameterize ((current-output-port port))
+       (for-each show-rtl-instruction rtl)))))
 
 (define (dump-rtl filename)
   (write-instructions
@@ -105,16 +104,16 @@ USA.
 
 (define (write-instructions thunk)
   (fluid-let ((*show-instruction* write))
-    (parameterize* (list (cons param:printer-radix 16)
-                        (cons param:print-uninterned-symbols-by-name? #t))
-      thunk)))
+    (parameterize ((param:printer-radix 16)
+                  (param:print-uninterned-symbols-by-name? #t))
+      (thunk))))
 
 (define (pp-instructions thunk)
   (fluid-let ((*show-instruction* pretty-print))
-    (parameterize* (list (cons param:pp-primitives-by-name? #f)
-                        (cons param:printer-radix 16)
-                        (cons param:print-uninterned-symbols-by-name? #t))
-      thunk)))
+    (parameterize ((param:pp-primitives-by-name? #f)
+                  (param:printer-radix 16)
+                  (param:print-uninterned-symbols-by-name? #t))
+      (thunk))))
 
 (define *show-instruction*)
 
index f164a62d2e98d023d80d9a0c9086b1b69b77aa32..43b4dabc59208d70a1c9913f1b568d9034557ca8 100644 (file)
@@ -64,9 +64,8 @@ USA.
                                    (fix:> (vector-length object) 0)
                                    (eq? tag (vector-ref object 0))))
          (lambda (vector port)
-           (parameterize* (list (cons param:printer-radix 16))
-             (lambda ()
-               ((tagged-vector/unparser vector) vector port)))))
+           (parameterize ((param:printer-radix 16))
+             ((tagged-vector/unparser vector) vector port))))
        tag))))
 
 (define (define-vector-tag-unparser tag unparser)
index e0afce317aa9bae40c230dbf159cdd956f9d7c0d..477dff42f5fde3a1553b72787841cd17370859ce 100644 (file)
@@ -1076,42 +1076,40 @@ USA.
 (define (phase/lap-file-output scode port)
   (compiler-phase "LAP File Output"
     (lambda ()
-      (parameterize* (list (cons param:printer-radix 16)
-                          (cons param:print-uninterned-symbols-by-name? #t))
-        (lambda ()
-         (parameterize* (list (cons current-output-port port))
-           (lambda ()
-             (write-string "LAP for object ")
-             (write *recursive-compilation-number*)
-             (newline)
-             (pp scode (current-output-port) #t 4)
-             (newline)
-             (newline)
-             (newline)
-             (for-each
-                 (lambda (instruction)
-                   (cond ((and (pair? instruction)
-                               (eq? (car instruction) 'LABEL))
-                          (write (cadr instruction))
-                          (write-char #\:))
-                         ((and (pair? instruction)
-                               (eq? (car instruction) 'COMMENT))
-                          (write-char #\tab)
-                          (write-string ";;")
-                          (for-each (lambda (frob)
-                                      (write-string " ")
-                                      (write (if (and (pair? frob)
-                                                      (eq? (car frob) 'RTL))
-                                                 (cadr frob)
-                                                 frob)))
-                            (cdr instruction)))
-                         (else
-                          (write-char #\tab)
-                          (write instruction)))
-                   (newline))
-               *lap*)
-             (if (not (zero? *recursive-compilation-number*))
-                 (begin
-                   (write-char #\page)
-                   (newline)))
-             (output-port/flush-output port))))))))
+      (parameterize ((param:printer-radix 16)
+                    (param:print-uninterned-symbols-by-name? #t))
+       (parameterize ((current-output-port port))
+         (write-string "LAP for object ")
+         (write *recursive-compilation-number*)
+         (newline)
+         (pp scode (current-output-port) #t 4)
+         (newline)
+         (newline)
+         (newline)
+         (for-each
+             (lambda (instruction)
+               (cond ((and (pair? instruction)
+                           (eq? (car instruction) 'LABEL))
+                      (write (cadr instruction))
+                      (write-char #\:))
+                     ((and (pair? instruction)
+                           (eq? (car instruction) 'COMMENT))
+                      (write-char #\tab)
+                      (write-string ";;")
+                      (for-each (lambda (frob)
+                                  (write-string " ")
+                                  (write (if (and (pair? frob)
+                                                  (eq? (car frob) 'RTL))
+                                             (cadr frob)
+                                             frob)))
+                        (cdr instruction)))
+                     (else
+                      (write-char #\tab)
+                      (write instruction)))
+               (newline))
+           *lap*)
+         (if (not (zero? *recursive-compilation-number*))
+             (begin
+               (write-char #\page)
+               (newline)))
+         (output-port/flush-output port))))))
index c66063afe8c2281869b18a756f41be366eb16886..960696e2feb6342090a819cf76606a3c0e718169 100644 (file)
@@ -117,25 +117,24 @@ USA.
   (disassembler/instructions #f start-address end-address #f))
 
 (define (disassembler/write-instruction-stream symbol-table instruction-stream)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (disassembler/for-each-instruction instruction-stream
-       (lambda (offset instruction comment)
-         (disassembler/write-instruction
-          symbol-table
-          offset
-          (lambda ()
-            (if comment
-                (let ((s
-                       (call-with-output-string
-                         (lambda (port)
-                           (display instruction port)))))
-                  (if (< (string-length s) 40)
-                      (write-string (string-pad-right s 40))
-                      (write-string s))
-                  (write-string "; ")
-                  (display comment))
-                (write instruction)))))))))
+  (parameterize ((param:printer-radix 16))
+    (disassembler/for-each-instruction instruction-stream
+      (lambda (offset instruction comment)
+       (disassembler/write-instruction
+        symbol-table
+        offset
+        (lambda ()
+          (if comment
+              (let ((s
+                     (call-with-output-string
+                       (lambda (port)
+                         (display instruction port)))))
+                (if (< (string-length s) 40)
+                    (write-string (string-pad-right s 40))
+                    (write-string s))
+                (write-string "; ")
+                (display comment))
+              (write instruction))))))))
 
 (define (disassembler/for-each-instruction instruction-stream procedure)
   (let loop ((instruction-stream instruction-stream))
@@ -146,31 +145,30 @@ USA.
            (loop (instruction-stream)))))))
 \f
 (define (disassembler/write-constants-block block symbol-table)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (let ((end (system-vector-length block)))
-       (let loop ((index (compiled-code-block/marked-start block)))
-         (cond ((not (< index end)) 'DONE)
-               ((object-type?
-                 (let-syntax ((ucode-type
-                               (sc-macro-transformer
-                                (lambda (form environment)
-                                  environment
-                                  (apply microcode-type (cdr form))))))
-                   (ucode-type linkage-section))
-                 (system-vector-ref block index))
-                (loop (disassembler/write-linkage-section block
-                                                          symbol-table
-                                                          index)))
-               (else
-                (disassembler/write-instruction
-                 symbol-table
-                 (compiled-code-block/index->offset index)
-                 (lambda ()
-                   (write-constant block
-                                   symbol-table
-                                   (system-vector-ref block index))))
-                (loop (1+ index)))))))))
+  (parameterize ((param:printer-radix 16))
+    (let ((end (system-vector-length block)))
+      (let loop ((index (compiled-code-block/marked-start block)))
+       (cond ((not (< index end)) 'DONE)
+             ((object-type?
+               (let-syntax ((ucode-type
+                             (sc-macro-transformer
+                              (lambda (form environment)
+                                environment
+                                (apply microcode-type (cdr form))))))
+                 (ucode-type linkage-section))
+               (system-vector-ref block index))
+              (loop (disassembler/write-linkage-section block
+                                                        symbol-table
+                                                        index)))
+             (else
+              (disassembler/write-instruction
+               symbol-table
+               (compiled-code-block/index->offset index)
+               (lambda ()
+                 (write-constant block
+                                 symbol-table
+                                 (system-vector-ref block index))))
+              (loop (1+ index))))))))
 
 (define (write-constant block symbol-table constant)
   (write-string (cdr (write-to-string constant 60)))
index 48491973f8a491ce5c5fb7b423729a29de5e1ce1..0c1f62a503aef3d8e983f8b3029d913f766c1c3f 100644 (file)
@@ -110,14 +110,13 @@ USA.
     (make-cursor block start symbol-table)))
 
 (define (write-instructions cursor)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (let ((end (compiled-code-block/code-end (cursor-block cursor))))
-       (let loop ()
-         (if (< (cursor-offset cursor) end)
-             (begin
-               (write-instruction cursor)
-               (loop))))))))
+  (parameterize ((param:printer-radix 16))
+    (let ((end (compiled-code-block/code-end (cursor-block cursor))))
+      (let loop ()
+       (if (< (cursor-offset cursor) end)
+           (begin
+             (write-instruction cursor)
+             (loop)))))))
 
 (define (write-instruction cursor)
   (write-offset cursor)
@@ -219,28 +218,27 @@ USA.
               #t)))))
 \f
 (define (write-constants cursor)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (let* ((block (cursor-block cursor))
-            (end (compiled-code-block/index->offset
-                  (system-vector-length block))))
-
-       (assert (= (cursor-offset cursor)
-                  (* (1+ (compiled-code-block/marked-start block))
-                     address-units-per-object)))
-       (let loop ()
-         (let ((offset (cursor-offset cursor)))
-           (if (< offset end)
-               (let ((object (system-vector-ref
-                              block (compiled-code-block/offset->index offset))))
-                 (if (object-type? (ucode-type linkage-section) object)
-                     (write-linkage-section object cursor)
-                     (begin
-                       (write-offset cursor)
-                       (write-constant object cursor)
-                       (set-cursor-offset! cursor
-                                           (+ offset address-units-per-object))))
-                 (loop)))))))))
+  (parameterize ((param:printer-radix 16))
+    (let* ((block (cursor-block cursor))
+          (end (compiled-code-block/index->offset
+                (system-vector-length block))))
+
+      (assert (= (cursor-offset cursor)
+                (* (1+ (compiled-code-block/marked-start block))
+                   address-units-per-object)))
+      (let loop ()
+       (let ((offset (cursor-offset cursor)))
+         (if (< offset end)
+             (let ((object (system-vector-ref
+                            block (compiled-code-block/offset->index offset))))
+               (if (object-type? (ucode-type linkage-section) object)
+                   (write-linkage-section object cursor)
+                   (begin
+                     (write-offset cursor)
+                     (write-constant object cursor)
+                     (set-cursor-offset! cursor
+                                         (+ offset address-units-per-object))))
+               (loop))))))))
 
 (define (write-constant constant cursor)
   (write-string (cdr (write-to-string constant 60)))
index ad93ad6461d0315d5d060c5e8728e99e3921ce0b..034951b165804278de357dbf1d39d37d9108ed9b 100644 (file)
@@ -117,25 +117,24 @@ USA.
   (disassembler/instructions #f start-address end-address #f))
 
 (define (disassembler/write-instruction-stream symbol-table instruction-stream)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (disassembler/for-each-instruction instruction-stream
-       (lambda (offset instruction comment)
-         (disassembler/write-instruction
-          symbol-table
-          offset
-          (lambda ()
-            (if comment
-                (let ((s
-                       (call-with-output-string
-                         (lambda (port)
-                           (display instruction port)))))
-                  (if (< (string-length s) 40)
-                      (write-string (string-pad-right s 40))
-                      (write-string s))
-                  (write-string "; ")
-                  (display comment))
-                (write instruction)))))))))
+  (parameterize ((param:printer-radix 16))
+    (disassembler/for-each-instruction instruction-stream
+      (lambda (offset instruction comment)
+       (disassembler/write-instruction
+        symbol-table
+        offset
+        (lambda ()
+          (if comment
+              (let ((s
+                     (call-with-output-string
+                       (lambda (port)
+                         (display instruction port)))))
+                (if (< (string-length s) 40)
+                    (write-string (string-pad-right s 40))
+                    (write-string s))
+                (write-string "; ")
+                (display comment))
+              (write instruction))))))))
 
 (define (disassembler/for-each-instruction instruction-stream procedure)
   (let loop ((instruction-stream instruction-stream))
@@ -146,31 +145,30 @@ USA.
            (loop (instruction-stream)))))))
 \f
 (define (disassembler/write-constants-block block symbol-table)
-  (parameterize* (list (cons param:printer-radix 16))
-    (lambda ()
-      (let ((end (system-vector-length block)))
-       (let loop ((index (compiled-code-block/marked-start block)))
-         (cond ((not (< index end)) 'DONE)
-               ((object-type?
-                 (let-syntax ((ucode-type
-                               (sc-macro-transformer
-                                (lambda (form environment)
-                                  environment
-                                  (apply microcode-type (cdr form))))))
-                   (ucode-type linkage-section))
-                 (system-vector-ref block index))
-                (loop (disassembler/write-linkage-section block
-                                                          symbol-table
-                                                          index)))
-               (else
-                (disassembler/write-instruction
-                 symbol-table
-                 (compiled-code-block/index->offset index)
-                 (lambda ()
-                   (write-constant block
-                                   symbol-table
-                                   (system-vector-ref block index))))
-                (loop (1+ index)))))))))
+  (parameterize ((param:printer-radix 16))
+    (let ((end (system-vector-length block)))
+      (let loop ((index (compiled-code-block/marked-start block)))
+       (cond ((not (< index end)) 'DONE)
+             ((object-type?
+               (let-syntax ((ucode-type
+                             (sc-macro-transformer
+                              (lambda (form environment)
+                                environment
+                                (apply microcode-type (cdr form))))))
+                 (ucode-type linkage-section))
+               (system-vector-ref block index))
+              (loop (disassembler/write-linkage-section block
+                                                        symbol-table
+                                                        index)))
+             (else
+              (disassembler/write-instruction
+               symbol-table
+               (compiled-code-block/index->offset index)
+               (lambda ()
+                 (write-constant block
+                                 symbol-table
+                                 (system-vector-ref block index))))
+              (loop (1+ index))))))))
 
 (define (write-constant block symbol-table constant)
   (write-string (cdr (write-to-string constant 60)))
index b6673c61c92dd81cbf8c28bf90de0631739611ed..dac2020c6a70487c813b73c46b33beeb483161c4 100644 (file)
@@ -681,9 +681,8 @@ Move to the last subproblem if the subproblem number is too high."
                        (if (or argument
                                (invalid-subexpression? sub))
                            (pp exp)
-                           (parameterize* (list (cons param:pp-no-highlights?
-                                                      #f))
-                             do-hairy)))
+                           (parameterize ((param:pp-no-highlights? #f))
+                             (do-hairy))))
                       ((debugging-info/noise? exp)
                        (message ((debugging-info/noise exp) #t)))
                       (else
@@ -1014,20 +1013,19 @@ Prefix argument means do not kill the debugger buffer."
        port))))
 
 (define (print-with-subexpression expression subexpression)
-  (parameterize* (list (cons param:print-primitives-by-name? #t))
-    (lambda ()
-      (if (invalid-subexpression? subexpression)
-         (write (unsyntax expression))
-         (let ((sub (write-to-string (unsyntax subexpression))))
-           (write (unsyntax-with-substitutions
-                   expression
-                   (list
-                    (cons subexpression
-                          (unparser-literal/make
-                           (string-append
-                            (ref-variable subexpression-start-marker)
-                            sub
-                            (ref-variable subexpression-end-marker))))))))))))
+  (parameterize ((param:print-primitives-by-name? #t))
+    (if (invalid-subexpression? subexpression)
+       (write (unsyntax expression))
+       (let ((sub (write-to-string (unsyntax subexpression))))
+         (write (unsyntax-with-substitutions
+                 expression
+                 (list
+                  (cons subexpression
+                        (unparser-literal/make
+                         (string-append
+                          (ref-variable subexpression-start-marker)
+                          sub
+                          (ref-variable subexpression-end-marker)))))))))))
 \f
 (define (invalid-subexpression? subexpression)
   (or (debugging-info/undefined-expression? subexpression)
@@ -1044,11 +1042,10 @@ Prefix argument means do not kill the debugger buffer."
    port))
 
 (define (print-reduction-as-subexpression expression)
-  (parameterize* (list (cons param:print-primitives-by-name? #t))
-    (lambda ()
-      (write-string (ref-variable subexpression-start-marker))
-      (write (unsyntax expression))
-      (write-string (ref-variable subexpression-end-marker)))))
+  (parameterize ((param:print-primitives-by-name? #t))
+    (write-string (ref-variable subexpression-start-marker))
+    (write (unsyntax expression))
+    (write-string (ref-variable subexpression-end-marker))))
 
 (define (print-history-level compiled? subproblem-number reduction-id
                             expression-thunk environment port)
@@ -1065,8 +1062,8 @@ Prefix argument means do not kill the debugger buffer."
         (cdr
          (call-with-truncated-output-string pad-width
            (lambda (port)
-             (parameterize* (list (cons current-output-port port))
-                            expression-thunk))))
+             (parameterize ((current-output-port port))
+               (expression-thunk)))))
         " ")
        pad-width
        #\-)
index db1ad3ee53494ffce8e4261009a86d967f87d95a..d09c93ad31f9b88544806286b3bf7314781779ae 100644 (file)
@@ -206,12 +206,11 @@ Second arg is prefix arg when called interactively."
                         (bind-condition-handler (list condition-type:error)
                             evaluation-error-handler
                           (lambda ()
-                            (parameterize*
-                             (list (cons param:suppress-loading-message? #t))
-                             (lambda ()
-                               ((message-wrapper #f "Loading " (car library))
-                                (lambda ()
-                                  (load-library library)))))))))
+                            (parameterize
+                                ((param:suppress-loading-message? #t))
+                              ((message-wrapper #f "Loading " (car library))
+                               (lambda ()
+                                 (load-library library))))))))
                   (load-library library))))))
       (cond ((not (library-loaded? name))
             (do-it))
@@ -236,6 +235,5 @@ Second arg PURIFY? means purify the file's contents after loading;
      (bind-condition-handler (list condition-type:error)
         evaluation-error-handler
        (lambda ()
-        (parameterize* (list (cons param:suppress-loading-message? #t))
-          (lambda ()
-            (load filename environment 'DEFAULT purify?))))))))
\ No newline at end of file
+        (parameterize ((param:suppress-loading-message? #t))
+          (load filename environment 'DEFAULT purify?)))))))
\ No newline at end of file
index ec713fac25a88cb2e524c3aaa8153b2ed5d702f3..60371c94dfea71183e2bc5d1b9824281b3b7ebc2 100644 (file)
@@ -274,8 +274,8 @@ When locked, the buffer's major mode may not be changed."
 (define (with-output-to-temporary-buffer name properties thunk)
   (call-with-output-to-temporary-buffer name properties
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-                    thunk))))
+      (parameterize ((current-output-port port))
+       (thunk)))))
 
 (define (call-with-temporary-buffer name procedure)
   (let ((buffer))
index 65efb86614e7e59416966745ce755c3f2a916b46..237dcba8292c188578c00f3962f779c13d4f6d57 100644 (file)
@@ -31,17 +31,17 @@ USA.
 (define (with-input-from-mark mark thunk #!optional receiver)
   (let ((port (make-buffer-input-port mark (group-end mark))))
     (let ((value
-          (parameterize* (list (cons current-input-port port))
-                         thunk)))
+          (parameterize ((current-input-port port))
+            (thunk))))
       (if (default-object? receiver)
          value
          (receiver value (input-port/mark port))))))
 
 (define (with-input-from-region region thunk)
-  (parameterize* (list (cons current-input-port
-                            (make-buffer-input-port (region-start region)
-                                                    (region-end region))))
-                thunk))
+  (parameterize ((current-input-port
+                 (make-buffer-input-port (region-start region)
+                                         (region-end region))))
+    (thunk)))
 
 (define (call-with-input-mark mark procedure)
   (procedure (make-buffer-input-port mark (group-end mark))))
index c5e33ae01b6139f26c54bc6190b3d66026f01883..2b7d9dfc6e9118cc687d7d73a4e92a8f868bc446 100644 (file)
@@ -32,8 +32,8 @@ USA.
 (define (with-output-to-mark mark thunk)
   (call-with-output-mark mark
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-                    thunk))))
+      (parameterize ((current-output-port port))
+       (thunk)))))
 
 (define (call-with-output-mark mark procedure)
   (let ((port (mark->output-port mark)))
index 3f6e50fe4742731e3a0c08935c5c1b6213a09342..dbb9a7907150556792a9587343dea099d5275064 100644 (file)
@@ -49,26 +49,25 @@ USA.
                                             indentation port)
   (let ((start-mark #f)
        (end-mark #f))
-    (parameterize* (list (cons param:pp-no-highlights? #f))
-      (lambda ()
-       (debugger-pp
-        (unsyntax-with-substitutions
-         expression
-         (list (cons subexpression
-                     (make-pretty-printer-highlight
-                      (unsyntax subexpression)
-                      (lambda (port)
-                        (set! start-mark
-                              (mark-right-inserting-copy
-                               (output-port->mark port)))
-                        unspecific)
-                      (lambda (port)
-                        (set! end-mark
-                              (mark-right-inserting-copy
-                               (output-port->mark port)))
-                        unspecific)))))
-        indentation
-        port)))
+    (parameterize ((param:pp-no-highlights? #f))
+      (debugger-pp
+       (unsyntax-with-substitutions
+       expression
+       (list (cons subexpression
+                   (make-pretty-printer-highlight
+                    (unsyntax subexpression)
+                    (lambda (port)
+                      (set! start-mark
+                            (mark-right-inserting-copy
+                             (output-port->mark port)))
+                      unspecific)
+                    (lambda (port)
+                      (set! end-mark
+                            (mark-right-inserting-copy
+                             (output-port->mark port)))
+                      unspecific)))))
+       indentation
+       port))
     (if (and start-mark end-mark)
        (highlight-region-excluding-indentation
         (make-region start-mark end-mark)
@@ -702,13 +701,11 @@ USA.
                                 (max summary-minimum-columns
                                      (- columns indentation 4))
                                 (lambda (port)
-                                  (parameterize*
-                                      (list (cons current-output-port port))
-                                    (lambda ()
-                                      ((bline-type/write-summary
-                                        (bline/type bline))
-                                       bline
-                                       (current-output-port))))))))
+                                  (parameterize ((current-output-port port))
+                                    ((bline-type/write-summary
+                                      (bline/type bline))
+                                     bline
+                                     (current-output-port)))))))
                           (insert-string (cdr summary) mark)
                           (if (car summary)
                               (insert-string " ..." mark)))
@@ -1292,13 +1289,11 @@ it has been renamed, it will not be deleted automatically.")
            (cond ((debugging-info/compiled-code? expression)
                   (write-string ";unknown compiled code" port))
                  ((not (debugging-info/undefined-expression? expression))
-                  (parameterize* (list (cons param:print-primitives-by-name?
-                                             #t))
-                    (lambda ()
-                      (write
-                       (unsyntax (if (invalid-subexpression? subexpression)
-                                     expression
-                                     subexpression))))))
+                  (parameterize ((param:print-primitives-by-name? #t))
+                    (write
+                     (unsyntax (if (invalid-subexpression? subexpression)
+                                   expression
+                                   subexpression)))))
                  ((debugging-info/noise? expression)
                   (write-string ";" port)
                   (write-string ((debugging-info/noise expression) #f)
@@ -1384,9 +1379,8 @@ it has been renamed, it will not be deleted automatically.")
            (subproblem/number (reduction/subproblem reduction)))
           port)))
     (write-string " " port)
-    (parameterize* (list (cons param:print-primitives-by-name? #t))
-      (lambda ()
-       (write (unsyntax (reduction/expression reduction)) port)))))
+    (parameterize ((param:print-primitives-by-name? #t))
+      (write (unsyntax (reduction/expression reduction)) port))))
 
 (define (reduction/write-description bline port)
   (let ((reduction (bline/object bline)))
index 691f8280341b1b80de06cea83b789be80dbd996f..b1de7d0efd387c37af1187ebf2f5a12676dfef5e 100644 (file)
@@ -71,19 +71,17 @@ USA.
                      (lambda (root-continuation)
                        (set! editor-thread-root-continuation
                              root-continuation)
-                       (parameterize* (list (cons notification-output-port
-                                                  null-output-port))
-                         (lambda ()
-                           (do ((thunks (let ((thunks editor-initial-threads))
-                                          (set! editor-initial-threads '())
-                                          thunks)
-                                        (cdr thunks)))
-                               ((null? thunks))
-                             (create-thread root-continuation
-                               (car thunks)
-                               (car thunks)))
-                           (top-level-command-reader
-                            edwin-initialization)))))))
+                       (parameterize ((notification-output-port
+                                       null-output-port))
+                         (do ((thunks (let ((thunks editor-initial-threads))
+                                        (set! editor-initial-threads '())
+                                        thunks)
+                                      (cdr thunks)))
+                             ((null? thunks))
+                           (create-thread root-continuation
+                                          (car thunks)
+                                          (car thunks)))
+                         (top-level-command-reader edwin-initialization))))))
                 message)
               #f
               `((START-CHILD ,(editor-start-child-cmdl with-editor-ungrabbed))
index dda1a90fb08b07d7a1c82fc43f9bf3cd3de12783..70699fd91bc6025cf57c4100e9b2514693e82f10 100644 (file)
@@ -233,10 +233,8 @@ The values are printed in the typein window."
                 (call-with-transcript-buffer
                  (lambda (buffer)
                    (insert-string
-                    (parameterize*
-                     (list (cons param:print-with-maximum-readability? #t))
-                     (lambda ()
-                       (write-to-string expression)))
+                    (parameterize ((param:print-with-maximum-readability? #t))
+                      (write-to-string expression))
                     (buffer-end buffer)))))
             (editor-eval buffer
                          expression
@@ -412,31 +410,28 @@ Set by Scheme evaluation code to update the mode line."
 (define (editor-eval buffer sexp environment)
   (let ((core
         (lambda ()
-          (parameterize* (list (cons current-input-port dummy-i/o-port))
-            (lambda ()
-              (let ((value))
-                (let ((output-string
-                       (call-with-output-string
-                         (lambda (port)
-                           (parameterize* (list (cons current-output-port
-                                                      port))
-                             (lambda ()
-                               (set! value
-                                     (eval-with-history sexp environment))
-                               unspecific))))))
-                  (let ((evaluation-output-receiver
-                         (ref-variable evaluation-output-receiver buffer)))
-                    (if evaluation-output-receiver
-                        (evaluation-output-receiver value output-string)
-                        (with-output-to-transcript-buffer
-                         (lambda ()
-                           (write-string output-string)
-                           (transcript-write
-                            value
-                            (and (ref-variable enable-transcript-buffer
-                                               buffer)
-                                 (transcript-buffer))))))))
-                value))))))
+          (parameterize ((current-input-port dummy-i/o-port))
+            (let ((value))
+              (let ((output-string
+                     (call-with-output-string
+                       (lambda (port)
+                         (parameterize ((current-output-port port))
+                           (set! value
+                                 (eval-with-history sexp environment))
+                           unspecific)))))
+                (let ((evaluation-output-receiver
+                       (ref-variable evaluation-output-receiver buffer)))
+                  (if evaluation-output-receiver
+                      (evaluation-output-receiver value output-string)
+                      (with-output-to-transcript-buffer
+                       (lambda ()
+                         (write-string output-string)
+                         (transcript-write
+                          value
+                          (and (ref-variable enable-transcript-buffer
+                                             buffer)
+                               (transcript-buffer))))))))
+              value)))))
     (if (ref-variable enable-run-light? buffer)
        (let ((run-light (ref-variable-object run-light))
              (outside)
@@ -481,16 +476,15 @@ Set by Scheme evaluation code to update the mode line."
               (let ((output-port
                      (mark->output-port (buffer-end buffer) buffer)))
                 (fresh-line output-port)
-                (parameterize* (list (cons current-output-port output-port))
-                               thunk))))))
+                (parameterize ((current-output-port output-port))
+                  (thunk)))))))
       (let ((value))
        (let ((output
               (call-with-output-string
                 (lambda (port)
-                  (parameterize* (list (cons current-output-port port))
-                    (lambda ()
-                      (set! value (thunk))
-                      unspecific))))))
+                  (parameterize ((current-output-port port))
+                    (set! value (thunk))
+                    unspecific)))))
          (if (and (not (string-null? output))
                   (not (ref-variable evaluation-output-receiver)))
              (string->temporary-buffer output "*Unsolicited-Output*" '())))
@@ -530,12 +524,11 @@ Set by Scheme evaluation code to update the mode line."
 (define (transcript-value-string value)
   (if (undefined-value? value)
       ""
-      (parameterize* (list (cons param:printer-list-depth-limit
-                                (ref-variable transcript-list-depth-limit))
-                          (cons param:printer-list-breadth-limit
-                                (ref-variable transcript-list-breadth-limit)))
-       (lambda ()
-         (write-to-string value)))))
+      (parameterize ((param:printer-list-depth-limit
+                     (ref-variable transcript-list-depth-limit))
+                    (param:printer-list-breadth-limit
+                     (ref-variable transcript-list-breadth-limit)))
+       (write-to-string value))))
 \f
 (define (call-with-transcript-buffer procedure)
   (let ((buffer (transcript-buffer)))
index 3e4b080c1d5edb7121d2a314cb07a9bbfc773756..ccec92bf528c3479fd9cda4838476f6b6bbf70bf 100644 (file)
@@ -61,9 +61,8 @@ USA.
   (bind-condition-handler (list condition-type:error)
       evaluation-error-handler
     (lambda ()
-      (parameterize* (list (cons current-input-port dummy-i/o-port))
-       (lambda ()
-         (with-output-to-transcript-buffer thunk))))))
+      (parameterize ((current-input-port dummy-i/o-port))
+       (with-output-to-transcript-buffer thunk)))))
 \f
 ;;;; Stepper Mode
 
index 19d742775cc22b8437361e64c0aa6e5dd42c4710..fb6c778b5b91b9b6ee3062e2ff541dd30b9b4d5d 100644 (file)
@@ -218,10 +218,8 @@ procedures are called."
                    (lambda ()
                      (catch-file-errors (lambda (condition) condition #f)
                        (lambda ()
-                         (parameterize*
-                          (list (cons param:suppress-loading-message? #t))
-                          (lambda ()
-                            (load pathname '(EDWIN))))))))))))
+                         (parameterize ((param:suppress-loading-message? #t))
+                           (load pathname '(EDWIN)))))))))))
          (if (and (procedure? database)
                   (procedure-arity-valid? database 1))
              (database buffer)
index 923406406bae226dc2de275f0882895b8bcb1a12..f4260e4265d4aa86eecbabb44214e8c34a2553d2 100644 (file)
@@ -318,9 +318,8 @@ If you want VALUE to be a string, you must surround it with doublequotes."
 (define (with-output-to-help-display thunk)
   (string->temporary-buffer (call-with-output-string
                              (lambda (port)
-                               (parameterize* (list (cons current-output-port
-                                                          port))
-                                              thunk)))
+                               (parameterize ((current-output-port port))
+                                 (thunk))))
                            "*Help*"
                            '(READ-ONLY)))
 
index dc85f554aada62bde3ad7ed3f3fa0255a0077528..b13526a735f94dc695701ff8836d032f5bae22c4 100644 (file)
@@ -122,23 +122,22 @@ evaluated in the specified inferior REPL buffer."
                                    (detach-thread thread)
                                    thread))))
        (attach-buffer-interface-port! buffer port)
-       (parameterize* (list (cons param:exit-hook inferior-repl/exit)
-                            (cons param:suspend-hook inferior-repl/suspend))
-         (lambda ()
-           (dynamic-wind
-            (lambda () unspecific)
-            (lambda ()
-              (repl/start (make-repl #f
-                                     port
-                                     environment
-                                     #f
-                                     `((ERROR-DECISION ,error-decision))
-                                     user-initial-prompt)
-                          (make-init-message message)))
-            (lambda ()
-              (signal-thread-event editor-thread
-                (lambda ()
-                  (unwind-inferior-repl-buffer buffer)))))))))
+       (parameterize ((param:exit-hook inferior-repl/exit)
+                      (param:suspend-hook inferior-repl/suspend))
+         (dynamic-wind
+          (lambda () unspecific)
+          (lambda ()
+            (repl/start (make-repl #f
+                                   port
+                                   environment
+                                   #f
+                                   `((ERROR-DECISION ,error-decision))
+                                   user-initial-prompt)
+                        (make-init-message message)))
+          (lambda ()
+            (signal-thread-event editor-thread
+              (lambda ()
+                (unwind-inferior-repl-buffer buffer))))))))
     buffer))
 
 (define (make-init-message message)
@@ -732,10 +731,8 @@ If this is an error, the debugger examines the error condition."
     (lambda (mark)
       (if mark
          (insert-string
-          (parameterize* (list (cons param:print-with-maximum-readability?
-                                     #t))
-            (lambda ()
-              (write-to-string expression)))
+          (parameterize ((param:print-with-maximum-readability? #t))
+            (write-to-string expression))
           mark))))
   (let ((port (buffer-interface-port buffer #t)))
     ;;(move-mark-to! (port/mark port) (buffer-end buffer))
index 89a40a66ff59c1b1819e380b70f6a87dfcf29f3b..eea3539fefcde4275d830d29daff44ed522b8ac8 100644 (file)
@@ -979,10 +979,8 @@ it is added to the front of the command history."
     (set-prompt-history-strings!
      'REPEAT-COMPLEX-COMMAND
      (map (lambda (command)
-           (parameterize* (list (cons param:print-with-maximum-readability?
-                                      #t))
-             (lambda ()
-               (write-to-string command))))
+           (parameterize ((param:print-with-maximum-readability? #t))
+             (write-to-string command)))
          (command-history-list)))
     (execute-command-history-entry
      (read-from-string
index 3de918086bb82e432fbeb94aeee41a8a657e68e3..5dac4adcc028369e9bf67300852325dc124b9561 100644 (file)
@@ -359,10 +359,8 @@ Otherwise, it is shown in the echo area."
                              ((symbol? argl)
                               (insert-string " . " point)
                               (insert-string (symbol->string argl) point)))))
-                   (parameterize*
-                    (list (cons param:print-uninterned-symbols-by-name? #t))
-                    (lambda ()
-                      (message procedure-name ": " argl)))))
+                   (parameterize ((param:print-uninterned-symbols-by-name? #t))
+                     (message procedure-name ": " argl))))
              (editor-error "Expression does not evaluate to a procedure: "
                            (extract-string start end))))))))
 
index d525f8bf02faabb53697fafb65f93dc208076991..53d1f29792ceea7903bfec6819aef88db35bbd5b 100644 (file)
@@ -33,8 +33,8 @@ USA.
   (with-output-to-window-point (current-window) thunk))
 
 (define (with-output-to-window-point window thunk)
-  (parameterize* (list (cons current-output-port (window-output-port window)))
-                thunk))
+  (parameterize ((current-output-port (window-output-port window)))
+    (thunk)))
 
 (define (window-output-port window)
   (make-port window-output-port-type window))
index 4c51d4fc7e889c13e3eea69263d8414e42f89c88..b30e635a9b44d09ac973677f0be510067f3ee3e7 100644 (file)
@@ -365,9 +365,8 @@ USA.
   (if (not (option-loaded? name))
       (let ((kernel
             (lambda ()
-              (parameterize* (list (cons param:suppress-loading-message? #t))
-                (lambda ()
-                  (load-option name))))))
+              (parameterize ((param:suppress-loading-message? #t))
+                (load-option name)))))
        (if (nearest-cmdl/batch-mode?)
            (kernel)
            (with-notification
index a63342dd6b0e29430e59d6c2eaa713ea6ef0848f..8dff0c062df13691b60a517b4986682ea6c0c86b 100644 (file)
@@ -91,9 +91,8 @@ USA.
              (lambda (inport)
                (let loop ()
                  (let ((form
-                        (parameterize* (list (cons param:reader-fold-case? #f))
-                          (lambda ()
-                            (read inport)))))
+                        (parameterize ((param:reader-fold-case? #f))
+                          (read inport))))
                    (if (not (eof-object? form))
                        (begin
                          (include-cdecl form new-cwd twd includes)
index 21459b2bf35dce00d8ce3df5c7889dcdc4cb0148..f9defe1a399a59b97cf04ee168e7cea67f993976 100644 (file)
@@ -249,10 +249,9 @@ USA.
   (if (< n (expt 10 (- k 1)))
       (string-append (string-pad-left (number->string n) (- k 1)) " ")
       (let ((s
-            (parameterize* (list (cons param:flonum-printer-cutoff
-                                       `(RELATIVE ,k ENGINEERING)))
-              (lambda ()
-                (number->string (exact->inexact n))))))
+            (parameterize ((param:flonum-printer-cutoff
+                            `(RELATIVE ,k ENGINEERING)))
+              (number->string (exact->inexact n)))))
        (let ((regs (re-string-match "\\([0-9.]+\\)e\\([0-9]+\\)" s)))
          (let ((mantissa (re-match-extract s regs 1))
                (exponent (string->number (re-match-extract s regs 2))))
index e98758f4db0947ddc0384ab3c4b65bc87d6f7265..749542637c860d16dd4a18707d32dfb42898ca3a 100644 (file)
@@ -84,31 +84,30 @@ USA.
       (lambda (original-body state)
        (call-with-current-continuation
         (lambda (continuation)
-          (parameterize* (list (cons advice-continuation continuation))
-            (lambda ()
-              (with-restart 'use-value
-                  "Return a value from the advised procedure."
-                  continuation
-                  (lambda ()
-                    (prompt-for-evaluated-expression "Procedure value"))
+          (parameterize ((advice-continuation continuation))
+            (with-restart 'use-value
+                "Return a value from the advised procedure."
+                continuation
                 (lambda ()
+                  (prompt-for-evaluated-expression "Procedure value"))
+              (lambda ()
+                (for-each (lambda (advice)
+                            (with-simple-restart 'continue
+                                "Continue with advised procedure."
+                              (lambda ()
+                                (advice procedure arguments environment))))
+                          (car state))
+                (let ((value (scode-eval original-body environment)))
                   (for-each (lambda (advice)
                               (with-simple-restart 'continue
-                                  "Continue with advised procedure."
+                                  "Return from advised procedure."
                                 (lambda ()
-                                  (advice procedure arguments environment))))
-                            (car state))
-                  (let ((value (scode-eval original-body environment)))
-                    (for-each (lambda (advice)
-                                (with-simple-restart 'continue
-                                    "Return from advised procedure."
-                                  (lambda ()
-                                    (advice procedure
-                                            arguments
-                                            value
-                                            environment))))
-                              (cdr state))
-                    value)))))))))))
+                                  (advice procedure
+                                          arguments
+                                          value
+                                          environment))))
+                            (cdr state))
+                  value))))))))))
 
 (define advice-continuation)
 \f
@@ -316,17 +315,15 @@ USA.
 ;;;; Break
 
 (define (break-entry-advice procedure arguments environment)
-  (parameterize* (list (cons the-procedure procedure)
-                      (cons the-arguments arguments))
-    (lambda ()
-      (break-rep environment "Breakpoint on entry" procedure arguments))))
+  (parameterize ((the-procedure procedure)
+                (the-arguments arguments))
+    (break-rep environment "Breakpoint on entry" procedure arguments)))
 
 (define (break-exit-advice procedure arguments result environment)
-  (parameterize* (list (cons the-procedure procedure)
-                      (cons the-arguments arguments)
-                      (cons the-result result))
-    (lambda ()
-      (break-rep environment "Breakpoint on exit" procedure arguments result)))
+  (parameterize ((the-procedure procedure)
+                (the-arguments arguments)
+                (the-result result))
+    (break-rep environment "Breakpoint on exit" procedure arguments result))
   result)
 
 (define (break-rep environment message . info)
index 401cbd5c6cbd857cd271370ddb552395bfbba3b9..289f1a387543ce927b323a231cdbac6c79dc9dcf 100644 (file)
@@ -79,14 +79,13 @@ USA.
 
     (set! *command-line-arguments* '())
     (let ((unused (or ((ucode-primitive get-unused-command-line 0)) '#())))
-      (parameterize* (list (cons param:load-init-file? #t))
-       (lambda ()
-         (process-keyword (vector->list unused) '())
-         (for-each (lambda (act) (act))
-                   (reverse after-parsing-actions))
-         (if (and (param:load-init-file?)
-                  (not (nearest-cmdl/batch-mode?)))
-             (load-init-file)))))))
+      (parameterize ((param:load-init-file? #t))
+       (process-keyword (vector->list unused) '())
+       (for-each (lambda (act) (act))
+                 (reverse after-parsing-actions))
+       (if (and (param:load-init-file?)
+                (not (nearest-cmdl/batch-mode?)))
+           (load-init-file))))))
 
 (define (find-keyword-parser keyword)
   (let ((entry (assoc (strip-leading-hyphens keyword) *command-line-parsers*)))
@@ -258,10 +257,9 @@ ADDITIONAL OPTIONS supported by this band:\n")
      (lambda (arg)
        (run-in-nearest-repl
        (lambda (repl)
-         (parameterize* (list (cons param:suppress-loading-message?
-                                    (cmdl/batch-mode? repl)))
-           (lambda ()
-             (load arg (repl/environment repl)))))))
+         (parameterize ((param:suppress-loading-message?
+                         (cmdl/batch-mode? repl)))
+           (load arg (repl/environment repl))))))
      "Loads the argument files as if in the REPL."
      "In batch mode, loading messages are suppressed.")
 
index 5b950410c48dfb914e226db54eeb21069a058af0..54079cf2213fba21772cedd65870ba89010b5a40 100644 (file)
@@ -90,8 +90,8 @@ USA.
     (let ((x
           (call-with-truncated-output-string length
             (lambda (port)
-              (parameterize* (list (cons current-output-port port))
-                             thunk)))))
+              (parameterize ((current-output-port port))
+                (thunk))))))
       (if (and (car x) (> length 4))
          (string-append (string-slice (cdr x) 0 (- length 4))
                         " ...")
index 864b901d23044edec62122f89b1036be87826010..b69f7063cb2e7fb4e616e4216c9662d49a37ce70 100644 (file)
@@ -473,9 +473,8 @@ USA.
          (output-to-string
           50
           (lambda ()
-            (parameterize* (list (cons param:print-primitives-by-name? #t))
-              (lambda ()
-                (write (unsyntax expression)))))))
+            (parameterize ((param:print-primitives-by-name? #t))
+              (write (unsyntax expression))))))
         ((debugging-info/noise? expression)
          (output-to-string
           50
@@ -808,12 +807,11 @@ USA.
 (define *port*)
 
 (define (command/internal dstate port)
-  (parameterize* (list (cons *dstate* dstate)
-                      (cons *port* port))
-    (lambda ()
-      (debug/read-eval-print (->environment '(runtime debugger))
-                            "the debugger"
-                            "the debugger environment"))))
+  (parameterize ((*dstate* dstate)
+                (*port* port))
+    (debug/read-eval-print (->environment '(runtime debugger))
+                          "the debugger"
+                          "the debugger environment")))
 
 (define-command (command/frame dstate port)
   (debugger-presentation port
@@ -954,14 +952,11 @@ using the read-eval-print environment instead.")
   (string-titlecase (if reason (string-append reason "; " message) message)))
 
 (define (debugger-pp expression indentation port)
-  (parameterize* (list (cons param:printer-list-depth-limit
-                            debugger:list-depth-limit)
-                      (cons param:printer-list-breadth-limit
-                            debugger:list-breadth-limit)
-                      (cons param:printer-string-length-limit
-                            debugger:string-length-limit))
-    (lambda ()
-      (pretty-print expression port true indentation))))
+  (parameterize ((param:printer-list-depth-limit debugger:list-depth-limit)
+                (param:printer-list-breadth-limit debugger:list-breadth-limit)
+                (param:printer-string-length-limit
+                 debugger:string-length-limit))
+    (pretty-print expression port true indentation)))
 
 (define expression-indentation 4)
 \f
index d9deb1f1961cb8fdb98f921fe87d844245c05be1..cf4459f14c621bdf652fb54d6fb7a7f84443b843 100644 (file)
@@ -334,11 +334,10 @@ USA.
       (error:wrong-type-argument effector "effector" 'with-restart))
   (if (not (or (not interactor) (procedure? interactor)))
       (error:wrong-type-argument interactor "interactor" 'with-restart))
-  (parameterize*
-   (list (cons param:bound-restarts
-              (cons (%make-restart name reporter effector interactor)
-                    (param:bound-restarts))))
-   thunk))
+  (parameterize ((param:bound-restarts
+                 (cons (%make-restart name reporter effector interactor)
+                       (param:bound-restarts))))
+    (thunk)))
 
 (define (with-simple-restart name reporter thunk)
   (call-with-current-continuation
@@ -514,10 +513,9 @@ USA.
 (define (bind-condition-handler types handler thunk)
   (guarantee-condition-types types 'bind-condition-handler)
   (guarantee-condition-handler handler 'bind-condition-handler)
-  (parameterize*
-   (list (cons dynamic-handler-frames
-              (cons (cons types handler) (dynamic-handler-frames))))
-   thunk))
+  (parameterize ((dynamic-handler-frames
+                 (cons (cons types handler) (dynamic-handler-frames))))
+    (thunk)))
 
 (define-integrable (guarantee-condition-handler object caller)
   (guarantee unary-procedure? object caller))
@@ -548,28 +546,25 @@ USA.
       (if (let ((types (break-on-signals-types)))
            (and (pair? types)
                 (intersect-generalizations? types)))
-         (parameterize* (list (cons break-on-signals-types '()))
-           (lambda ()
-             (breakpoint-procedure 'inherit
-                                   "BKPT entered because of BREAK-ON-SIGNALS:"
-                                   condition))))
+         (parameterize ((break-on-signals-types '()))
+           (breakpoint-procedure 'inherit
+                                 "BKPT entered because of BREAK-ON-SIGNALS:"
+                                 condition)))
       (do ((frames (dynamic-handler-frames) (cdr frames)))
          ((not (pair? frames)))
        (if (let ((types (caar frames)))
              (or (not (pair? types))
                  (intersect-generalizations? types)))
-           (parameterize* (list (cons dynamic-handler-frames (cdr frames)))
-             (lambda ()
-               (hook/invoke-condition-handler (cdar frames) condition)))))
+           (parameterize ((dynamic-handler-frames (cdr frames)))
+             (hook/invoke-condition-handler (cdar frames) condition))))
       (do ((frames (static-handler-frames) (cdr frames)))
          ((not (pair? frames)))
        (if (let ((types (caar frames)))
              (or (not (pair? types))
                  (intersect-generalizations? types)))
-           (parameterize* (list (cons dynamic-handler-frames '())
-                                (cons static-handler-frames (cdr frames)))
-             (lambda ()
-               (hook/invoke-condition-handler (cdar frames) condition)))))
+           (parameterize ((dynamic-handler-frames '())
+                          (static-handler-frames (cdr frames)))
+             (hook/invoke-condition-handler (cdar frames) condition))))
       unspecific)))
 \f
 ;;;; Standard Condition Signallers
@@ -604,9 +599,8 @@ USA.
             standard-error-hook)))
     (if hook
        (fluid-let ((standard-error-hook #!default))
-         (parameterize* (list (cons param:standard-error-hook #f))
-           (lambda ()
-             (hook condition))))))
+         (parameterize ((param:standard-error-hook #f))
+           (hook condition)))))
   (repl/start (push-repl 'inherit condition '() "error>")))
 
 (define (standard-warning-handler condition)
@@ -616,9 +610,8 @@ USA.
             standard-warning-hook)))
     (if hook
        (fluid-let ((standard-warning-hook #!default))
-         (parameterize* (list (cons param:standard-warning-hook #f))
-           (lambda ()
-             (hook condition))))
+         (parameterize ((param:standard-warning-hook #f))
+           (hook condition)))
        (let ((port (notification-output-port)))
          (fresh-line port)
          (write-string ";Warning: " port)
@@ -1293,20 +1286,19 @@ USA.
              (else (error "Unexpected value:" v)))))))
 
 (define (format-error-message message irritants port)
-  (parameterize* (list (cons param:printer-list-depth-limit 2)
-                      (cons param:printer-list-breadth-limit 5))
-    (lambda ()
-      (for-each (lambda (irritant)
-                 (if (and (pair? irritant)
-                          (eq? (car irritant) error-irritant/noise-tag))
-                     (display (cdr irritant) port)
-                     (begin
-                       (write-char #\space port)
-                       (write irritant port))))
-               (cons (if (string? message)
-                         (error-irritant/noise message)
-                         message)
-                     irritants)))))
+  (parameterize ((param:printer-list-depth-limit 2)
+                (param:printer-list-breadth-limit 5))
+    (for-each (lambda (irritant)
+               (if (and (pair? irritant)
+                        (eq? (car irritant) error-irritant/noise-tag))
+                   (display (cdr irritant) port)
+                   (begin
+                     (write-char #\space port)
+                     (write irritant port))))
+             (cons (if (string? message)
+                       (error-irritant/noise message)
+                       message)
+                   irritants))))
 
 (define-integrable (error-irritant/noise noise)
   (cons error-irritant/noise-tag noise))
index 3f0fda933ed539a6aa1f32a1520e50dae1f7ac6e..3be4c1d32ea627ea87516ecf1851afe9035d2263 100644 (file)
@@ -621,9 +621,8 @@ USA.
   (if (not (option-loaded? name))
       (let ((kernel
             (lambda ()
-              (parameterize* (list (cons param:suppress-loading-message? #t))
-                (lambda ()
-                  (load-option name))))))
+              (parameterize ((param:suppress-loading-message? #t))
+                (load-option name)))))
        (if (nearest-cmdl/batch-mode?)
            (kernel)
            (with-notification
index 914409be47278a4b833848a6525c94ecbd87f437..cf39716895507fc6260eb3d188e4a86c1463b2b9 100644 (file)
@@ -229,8 +229,8 @@ USA.
 (define ((make-with-input-from-file call) input-specifier thunk)
   (call input-specifier
     (lambda (port)
-      (parameterize* (list (cons current-input-port port))
-                    thunk))))
+      (parameterize ((current-input-port port))
+       (thunk)))))
 
 (define with-input-from-file
   (make-with-input-from-file call-with-input-file))
@@ -241,8 +241,8 @@ USA.
 (define ((make-with-output-to-file call) output-specifier thunk)
   (call output-specifier
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-                    thunk))))
+      (parameterize ((current-output-port port))
+       (thunk)))))
 
 (define with-output-to-file
   (make-with-output-to-file call-with-output-file))
index bfeaef6e4a69f340a4c02f495f1a682651c8000d..e1ef3daabcddf045c6bf148e193b5ebefb2586a9 100644 (file)
@@ -186,9 +186,8 @@ USA.
 (define ((hardware-trap-noise frame) long?)
   (call-with-output-string
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-       (lambda ()
-         (hardware-trap-frame/describe frame long?))))))
+      (parameterize ((current-output-port port))
+       (hardware-trap-frame/describe frame long?)))))
 \f
 (define (method/compiled-code frame)
   (let ((get-environment
index 666e2d4b6538f3421b13124a1597f06680c865d1..b4129cd894cd81a970440ae62adf2094f5555f97 100644 (file)
@@ -218,12 +218,11 @@ USA.
   (make-settable-parameter '()))
 
 (define (with-directory-rewriting-rule match replace thunk)
-  (parameterize*
-   (list (cons directory-rewriting-rules
-              (cons (cons (pathname-as-directory (merge-pathnames match))
-                          replace)
-                    (directory-rewriting-rules))))
-   thunk))
+  (parameterize ((directory-rewriting-rules
+                 (cons (cons (pathname-as-directory (merge-pathnames match))
+                             replace)
+                       (directory-rewriting-rules))))
+    (thunk)))
 
 (define (add-directory-rewriting-rule! match replace)
   (let ((match (pathname-as-directory (merge-pathnames match))))
index 622895fd49aa1a2ccaa4f835f50dee420d78cb39..a9ed8a812b03dbe3d61ab90ebd8d9b921be26103 100644 (file)
@@ -155,10 +155,9 @@ USA.
 (define (wrap-loader pathname loader)
   (lambda (environment purify?)
     (lambda ()
-      (parameterize* (list (cons current-load-pathname pathname)
-                          (cons current-load-environment environment))
-       (lambda ()
-         (loader environment purify?))))))
+      (parameterize ((current-load-pathname pathname)
+                    (current-load-environment environment))
+       (loader environment purify?)))))
 \f
 (define (fasload pathname #!optional suppress-notifications?)
   (receive (pathname* loader notifier) (choose-fasload-method pathname)
@@ -261,11 +260,10 @@ USA.
                 suppress-notifications?)
             #f
             (param:write-notifications?))))
-    (parameterize* (list (cons param:write-notifications? notify?))
-      (lambda ()
-       (if notify?
-           (notifier loader)
-           (loader))))))
+    (parameterize ((param:write-notifications? notify?))
+      (if notify?
+         (notifier loader)
+         (loader)))))
 
 (define (loading-notifier pathname)
   (lambda (thunk)
@@ -289,11 +287,10 @@ USA.
 (define (handle-load-hooks thunk)
   (receive (result hooks)
       (fluid-let ((load/loading? #t))  ;backwards compatibility
-       (parameterize* (list (cons param:loading? #t)
-                            (cons param:after-load-hooks '()))
-         (lambda ()
-           (let ((result (thunk)))
-             (values result (reverse (param:after-load-hooks)))))))
+       (parameterize ((param:loading? #t)
+                      (param:after-load-hooks '()))
+         (let ((result (thunk)))
+           (values result (reverse (param:after-load-hooks))))))
     (for-each (lambda (hook) (hook)) hooks)
     result))
 
index c96542ee9a6595b8bd6f96e78ce0a3fec2d8fb40..a970b77332f390f44b8b0cbe6a010d9e28562eee 100644 (file)
@@ -440,9 +440,8 @@ USA.
         (apply scons-begin (read-files filenames #t)))))))
 
 (define (read-files filenames fold-case?)
-  (parameterize* (list (cons param:reader-fold-case? fold-case?))
-    (lambda ()
-      (append-map read-file filenames))))
+  (parameterize ((param:reader-fold-case? fold-case?))
+    (append-map read-file filenames)))
 \f
 (define $define-values
   (spar-transformer->runtime
index 50dfa8b6e187f0305f68c477eb99ed750771dfc2..1091256280263de5f590b9c406a5ad1ef6e16555 100644 (file)
@@ -58,9 +58,8 @@ USA.
           (lambda (pathname)
             (merge-pathnames pathname directory-path)))
         (let ((fnames (generate-directory-pathnames pattern)))
-          (parameterize* (list (cons *expand-directory-prefixes?* #f))
-            (lambda ()
-              (map ->pathname fnames)))))))
+          (parameterize ((*expand-directory-prefixes?* #f))
+            (map ->pathname fnames))))))
 
 (define (generate-directory-pathnames pathname)
   (let ((channel (directory-channel-open (->namestring pathname))))
@@ -79,10 +78,9 @@ USA.
             (cons (merge-pathnames (car entry) directory-path)
                   (cdr entry))))
         (let ((entries (generate-directory-entries pattern)))
-          (parameterize* (list (cons *expand-directory-prefixes?* #f))
-            (lambda ()
-              (map (lambda (entry) (cons (->pathname (car entry)) (cdr entry)))
-                   entries)))))))
+          (parameterize ((*expand-directory-prefixes?* #f))
+            (map (lambda (entry) (cons (->pathname (car entry)) (cdr entry)))
+                 entries))))))
 
 (define (generate-directory-entries pathname)
   (let ((channel (directory-channel-open (->namestring pathname))))
index 1ed6053089628471a106dfa77667b6f957cbba0c..981e4a2b8a91d8c8d94458cbe8afc0fe4a6e66f1 100644 (file)
@@ -46,12 +46,11 @@ USA.
     (define (search-parent pathname)
       (call-with-values
          (lambda ()
-           (parameterize* (list (cons *options* '())
-                                (cons *parent* #f)
-                                (cons param:suppress-loading-message? #t))
-             (lambda ()
-               (load pathname (simple-top-level-environment #t))
-               (values (*options*) (*parent*)))))
+           (parameterize ((*options* '())
+                          (*parent* #f)
+                          (param:suppress-loading-message? #t))
+             (load pathname (simple-top-level-environment #t))
+             (values (*options*) (*parent*))))
        find-option))
 
     (if (memq name loaded-options)
index 8b9780848102132814e0fc90f0d91dc9a88f5b29..8dda0635df9713615731f787b9fd3e6e70fe32de 100644 (file)
@@ -303,28 +303,27 @@ USA.
        0)))
 
 (define (pp-top-level expression port as-code? indentation list-depth)
-  (parameterize* (list (cons x-size
-                            (- (or (get-param:pp-forced-x-size)
-                                   (output-port/x-size port))
-                               1))
-                      (cons output-port port)
-                      (cons param:print-uninterned-symbols-by-name?
-                            (get-param:pp-uninterned-symbols-by-name?))
-                      (cons param:printer-abbreviate-quotations?
-                            (or as-code?
-                                (param:printer-abbreviate-quotations?))))
-    (lambda ()
-      (let* ((numerical-walk
-             (if (get-param:pp-avoid-circularity?)
-                 numerical-walk-avoid-circularities
-                 numerical-walk))
-            (node (numerical-walk expression list-depth)))
-       (if (positive? indentation)
-           (*print-string (make-string indentation #\space)))
-       (if as-code?
-           (print-node node indentation list-depth)
-           (print-non-code-node node indentation list-depth))
-       (output-port/discretionary-flush port)))))
+  (parameterize ((x-size
+                 (- (or (get-param:pp-forced-x-size)
+                        (output-port/x-size port))
+                    1))
+                (output-port port)
+                (param:print-uninterned-symbols-by-name?
+                 (get-param:pp-uninterned-symbols-by-name?))
+                (param:printer-abbreviate-quotations?
+                 (or as-code?
+                     (param:printer-abbreviate-quotations?))))
+    (let* ((numerical-walk
+           (if (get-param:pp-avoid-circularity?)
+               numerical-walk-avoid-circularities
+               numerical-walk))
+          (node (numerical-walk expression list-depth)))
+      (if (positive? indentation)
+         (*print-string (make-string indentation #\space)))
+      (if as-code?
+         (print-node node indentation list-depth)
+         (print-non-code-node node indentation list-depth))
+      (output-port/discretionary-flush port))))
 
 (define x-size)
 (define output-port)
@@ -348,19 +347,17 @@ USA.
   (*print-char #\newline))
 \f
 (define (print-non-code-node node column depth)
-  (parameterize* (list (cons dispatch-list '())
-                      (cons dispatch-default
-                            (if (get-param:pp-lists-as-tables?)
-                                print-data-table
-                                print-data-column)))
-    (lambda ()
-      (print-node node column depth))))
+  (parameterize ((dispatch-list '())
+                (dispatch-default
+                 (if (get-param:pp-lists-as-tables?)
+                     print-data-table
+                     print-data-column)))
+    (print-node node column depth)))
 
 (define (print-code-node node column depth)
-  (parameterize* (list (cons dispatch-list (code-dispatch-list))
-                      (cons dispatch-default print-combination))
-    (lambda ()
-      (print-node node column depth))))
+  (parameterize ((dispatch-list (code-dispatch-list))
+                (dispatch-default print-combination))
+    (print-node node column depth)))
 
 (define (print-data-column nodes column depth)
   (*print-open)
@@ -840,20 +837,19 @@ USA.
 
 (define (walk-highlighted-object object list-depth numerical-walk)
   (let ((dl (pph/depth-limit object)))
-    (parameterize* (list (cons param:printer-list-breadth-limit
-                              (let ((bl (pph/breadth-limit object)))
-                                (if (eq? bl 'default)
-                                    (param:printer-list-breadth-limit)
-                                    bl)))
-                        (cons param:printer-list-depth-limit
-                              (if (eq? dl 'default)
-                                  (param:printer-list-depth-limit)
-                                  dl)))
-      (lambda ()
-       (numerical-walk (pph/object object)
-                       (if (eq? dl 'default)
-                           list-depth
-                           0))))))
+    (parameterize ((param:printer-list-breadth-limit
+                   (let ((bl (pph/breadth-limit object)))
+                     (if (eq? bl 'default)
+                         (param:printer-list-breadth-limit)
+                         bl)))
+                  (param:printer-list-depth-limit
+                   (if (eq? dl 'default)
+                       (param:printer-list-depth-limit)
+                       dl)))
+      (numerical-walk (pph/object object)
+                     (if (eq? dl 'default)
+                         list-depth
+                         0)))))
 
 \f
 ;;;     The following are circular list/vector handing procedures.  They allow
index 3adea0c8c122c103319df61196354c0f4080b800..476c7d8faeb0b5e3a615362c01479541cbc415bd 100644 (file)
@@ -83,14 +83,12 @@ USA.
   ;; do not have enough information to determine what the
   ;; variable name was.  The original block can be used for
   ;; this, but it may as well be copied then.
-  (parameterize* (list (cons *copy-constants?*
-                            (if (default-object? copy-constants?)
-                                *default/copy-constants?*
-                                copy-constants?))
-                      (cons *object-copies*
-                            (make-object-association-table)))
-    (lambda ()
-      (copy-object exp))))
+  (parameterize ((*copy-constants?*
+                 (if (default-object? copy-constants?)
+                     *default/copy-constants?*
+                     copy-constants?))
+                (*object-copies* (make-object-association-table)))
+    (copy-object exp)))
 
 (define (copy-object obj)
   (let ((association (object-association obj)))
index 8e4dbd8f8aa1a2cda8d5a5a7ed381f53e6baac55..f2f5f8fc0120bc29d33423cd868c24b9ada806e4 100644 (file)
@@ -181,9 +181,8 @@ USA.
   (textual-port-char-set (context-port context)))
 
 (define (with-current-unparser-state context procedure)
-  (parameterize* (list (cons initial-context context))
-    (lambda ()
-      (procedure (context-port context)))))
+  (parameterize ((initial-context context))
+    (procedure (context-port context))))
 
 (define-deferred initial-context
   (make-unsettable-parameter #f))
@@ -319,9 +318,8 @@ USA.
            context)))))
 
 (define (call-print-method print-method object context)
-  (parameterize* (list (cons initial-context context))
-    (lambda ()
-      (print-method object (context-port context)))))
+  (parameterize ((initial-context context))
+    (print-method object (context-port context))))
 
 (define (get-print-method-parts object)
   (let ((print-method (get-print-method object)))
index 019e306a3804bbc0a215f96f84d415e422ed6f92..b45f47f6ee8ae7a00aaae101daf54ed3114fcd7a 100644 (file)
@@ -120,40 +120,40 @@ USA.
        (pathname-defaults (param:default-pathname-defaults)))
     (let ((thunk
           (lambda ()
-            (parameterize*
-             (list (cons current-input-port #f)
-                   (cons current-output-port #f)
-                   (cons notification-output-port #f)
-                   (cons trace-output-port #f)
-                   (cons interaction-i/o-port #f)
-                   (cons working-directory-pathname
-                         (working-directory-pathname))
-                   (cons param:nearest-cmdl cmdl)
-                   (cons param:standard-error-hook #f)
-                   (cons param:standard-warning-hook #f)
-                   (cons param:standard-breakpoint-hook #f)
-                   (cons param:default-pathname-defaults pathname-defaults)
-                   (cons dynamic-handler-frames '())
-                   (cons param:bound-restarts
-                         (if (cmdl/parent cmdl) (param:bound-restarts) '())))
-             (lambda ()
-               (fluid-let ((*default-pathname-defaults* pathname-defaults))
-                 (let loop ((message message))
-                   (loop
-                    (bind-abort-restart cmdl
-                      (lambda ()
-                        (with-interrupt-mask interrupt-mask/all
-                          (lambda (interrupt-mask)
-                            interrupt-mask
-                            (unblock-thread-events)
-                            (ignore-errors
-                             (lambda ()
-                               ((->cmdl-message message) cmdl)))
-                            (call-with-current-continuation
-                             (lambda (continuation)
-                               (with-create-thread-continuation continuation
-                                 (lambda ()
-                                   ((cmdl/driver cmdl) cmdl))))))))))))))))
+            (parameterize ((current-input-port #f)
+                           (current-output-port #f)
+                           (notification-output-port #f)
+                           (trace-output-port #f)
+                           (interaction-i/o-port #f)
+                           (working-directory-pathname
+                            (working-directory-pathname))
+                           (param:nearest-cmdl cmdl)
+                           (param:standard-error-hook #f)
+                           (param:standard-warning-hook #f)
+                           (param:standard-breakpoint-hook #f)
+                           (param:default-pathname-defaults pathname-defaults)
+                           (dynamic-handler-frames '())
+                           (param:bound-restarts
+                            (if (cmdl/parent cmdl)
+                                (param:bound-restarts)
+                                '())))
+              (fluid-let ((*default-pathname-defaults* pathname-defaults))
+                (let loop ((message message))
+                  (loop
+                   (bind-abort-restart cmdl
+                     (lambda ()
+                       (with-interrupt-mask interrupt-mask/all
+                         (lambda (interrupt-mask)
+                           interrupt-mask
+                           (unblock-thread-events)
+                           (ignore-errors
+                            (lambda ()
+                              ((->cmdl-message message) cmdl)))
+                           (call-with-current-continuation
+                            (lambda (continuation)
+                              (with-create-thread-continuation continuation
+                                (lambda ()
+                                  ((cmdl/driver cmdl) cmdl)))))))))))))))
          (mutex (textual-port-thread-mutex port)))
       (let ((thread (current-thread))
            (owner (thread-mutex-owner mutex)))
@@ -547,12 +547,10 @@ USA.
      (or message
         (and condition
              (cmdl-message/strings
-              (parameterize*
-               (list (cons param:printer-list-depth-limit 25)
-                     (cons param:printer-list-breadth-limit 100)
-                     (cons param:printer-string-length-limit 500))
-               (lambda ()
-                 (condition/report-string condition))))))
+              (parameterize ((param:printer-list-depth-limit 25)
+                             (param:printer-list-breadth-limit 100)
+                             (param:printer-string-length-limit 500))
+                (condition/report-string condition)))))
      (and condition
          repl:allow-restart-notifications?
          (condition-restarts-message condition))
@@ -958,9 +956,8 @@ USA.
             standard-breakpoint-hook)))
     (if hook
        (fluid-let ((standard-breakpoint-hook #!default))
-         (parameterize* (list (cons param:standard-breakpoint-hook #f))
-           (lambda ()
-             (hook condition))))))
+         (parameterize ((param:standard-breakpoint-hook #f))
+           (hook condition)))))
   (repl/start (push-repl (breakpoint/environment condition)
                         condition
                         '()
index 01bcd4ee4283b8f4a3e8a4a209f254a1a3e28a69..4f9513175962d1ce0ee036dfe87abeaf9536ddf6 100644 (file)
@@ -83,9 +83,8 @@ USA.
           (lambda ()
             (set! time-world-saved time)
             (set! time-world-restored (get-universal-time))
-            (parameterize* (list (cons *within-restore-window?* #t))
-              (lambda ()
-                (event-distributor/invoke! event:after-restore)))
+            (parameterize ((*within-restore-window?* #t))
+              (event-distributor/invoke! event:after-restore))
             (start-thread-timer)
             (cond ((string? id)
                    (set! world-id id)
index 41a7fab79309123e45626ed5ad556a1e71a6936e..ebe350bbe1d9c11053712193a1310afc3ab07f42 100644 (file)
        (let ((stack-frame (continuation/first-subproblem continuation)))
          (if (eq? stack-frame-type/compiled-return-address
                   (stack-frame/type stack-frame))
-             (parameterize*
-             (list (cons stack-sampling-return-address
-                         (stack-frame/return-address stack-frame)))
-             thunk)
+             (parameterize ((stack-sampling-return-address
+                            (stack-frame/return-address stack-frame)))
+              (thunk))
              (thunk)))))))
 \f
 ;;;; Profile Data
 
 (define (profile-pp expression output-port)
   ;; Random parametrization.
-  (parameterize* (list (cons param:printer-list-breadth-limit 5)
-                      (cons param:printer-list-depth-limit 3)
-                      (cons param:printer-string-length-limit 40)
-                      (cons param:print-primitives-by-name? #t)
-                      (cons param:pp-save-vertical-space? #t)
-                      (cons param:pp-default-as-code? #t))
-    (lambda ()
-      (pp expression output-port))))
\ No newline at end of file
+  (parameterize ((param:printer-list-breadth-limit 5)
+                (param:printer-list-depth-limit 3)
+                (param:printer-string-length-limit 40)
+                (param:print-primitives-by-name? #t)
+                (param:pp-save-vertical-space? #t)
+                (param:pp-default-as-code? #t))
+    (pp expression output-port)))
\ No newline at end of file
index 7425590d283aa8b8c18df7ca2a5a23c9994a5815..8d60fdfc19276af1e050eb5ddca626611c69279e 100644 (file)
@@ -33,8 +33,8 @@ USA.
 
 ;; obsolete
 (define (with-input-from-string string thunk)
-  (parameterize* (list (cons current-input-port (open-input-string string)))
-                thunk))
+  (parameterize ((current-input-port (open-input-string string)))
+    (thunk)))
 
 (define (call-with-input-string string procedure)
   (procedure (open-input-string string)))
@@ -139,15 +139,15 @@ USA.
 (define (with-output-to-string thunk)
   (call-with-output-string
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-                    thunk))))
+      (parameterize ((current-output-port port))
+       (thunk)))))
 
 ;; deprecated
 (define (with-output-to-truncated-string limit thunk)
   (call-with-truncated-output-string limit
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-                    thunk))))
+      (parameterize ((current-output-port port))
+       (thunk)))))
 \f
 (define (open-output-string)
   (make-textual-port string-output-type (make-ostate (string-builder) 0)))
index 245c6b47e143417a7187db763c546533feead7e3..79d12ca1506f35875a21571c40cb0a2bfa7588d9 100644 (file)
@@ -82,10 +82,9 @@ USA.
 ;;;; Compiler
 
 (define (compile-top-level pattern caller-context env)
-  (parameterize* (list (cons name-counters (make-strong-eq-hash-table)))
-    (lambda ()
-      (optimize-result
-       (compile-pattern pattern caller-context env)))))
+  (parameterize ((name-counters (make-strong-eq-hash-table)))
+    (optimize-result
+     (compile-pattern pattern caller-context env))))
 
 (define (compile-pattern pattern caller-context env)
   (let ((pattern* (rewrite-pattern pattern)))
index d1aea604a7f54ce75b4d645d619c85f56c3f638f..48b2c70630f7a51343f85dcfeee8e63b4317a5bd 100644 (file)
@@ -117,9 +117,8 @@ USA.
   (do () (#f)
     (with-simple-restart 'abort "Return to SLIME top-level."
       (lambda ()
-       (parameterize* (list (cons *top-level-restart* (find-restart 'abort)))
-         (lambda ()
-           (process-one-message socket 0)))))))
+       (parameterize ((*top-level-restart* (find-restart 'abort)))
+         (process-one-message socket 0))))))
 
 (define *top-level-restart*)
 
@@ -219,11 +218,10 @@ USA.
 (define *index*)
 
 (define (emacs-rex socket sexp pstring id)
-  (parameterize* (list (cons *buffer-pstring* pstring)
-                      (cons *index* id))
-    (lambda ()
-      (eval (cons* (car sexp) socket (map quote-special (cdr sexp)))
-           swank-env))))
+  (parameterize ((*buffer-pstring* pstring)
+                (*index* id))
+    (eval (cons* (car sexp) socket (map quote-special (cdr sexp)))
+         swank-env)))
 
 (define *buffer-pstring*)
 
@@ -306,7 +304,7 @@ USA.
   (let ((p (make-textual-port repl-port-type socket)))
     (dynamic-wind
        (lambda () unspecific)
-       (lambda () (parameterize* (list (cons current-output-port p)) thunk))
+       (lambda () (parameterize ((current-output-port p)) (thunk)))
        (lambda () (flush-output-port p)))))
 
 (define repl-port-type)
@@ -385,11 +383,10 @@ USA.
   socket
   (call-with-output-string
     (lambda (port)
-      (parameterize* (list (cons current-output-port port))
-       (lambda ()
-         ((environment-lookup #f 'compiler:disassemble)
-          (eval (read-from-string string)
-                (buffer-env))))))))
+      (parameterize ((current-output-port port))
+       ((environment-lookup #f 'compiler:disassemble)
+        (eval (read-from-string string)
+              (buffer-env)))))))
 
 ;;;; Directory Functions
 (define (swank:default-directory socket)
@@ -496,11 +493,10 @@ USA.
            (lambda ()
              (call-with-output-string
                (lambda (port)
-                 (parameterize* (list (cons current-output-port port))
-                   (lambda ()
-                     (carefully-pa
-                      (eval (read-from-string name)
-                            (pstring->env pstring)))))))))))
+                 (parameterize ((current-output-port port))
+                   (carefully-pa
+                    (eval (read-from-string name)
+                          (pstring->env pstring))))))))))
     (if (condition? v) 'nil v)))
 
 (define (carefully-pa o)
@@ -552,9 +548,8 @@ USA.
                                (string-trim
                                 (call-with-output-string
                                   (lambda (port)
-                                    (parameterize*
-                                     (list (cons current-output-port port))
-                                     (lambda () (pa binding))))))))
+                                    (parameterize ((current-output-port port))
+                                      (pa binding)))))))
                         #f))
                   (let ((extra (assq symbol swank-extra-documentation)))
                     (if extra
@@ -669,18 +664,16 @@ swank:xref
 (define *sldb-state*)
 
 (define (invoke-sldb socket level condition)
-  (parameterize*
-   (list (cons *sldb-state*
-              (make-sldb-state condition (bound-restarts-for-emacs))))
-   (lambda ()
-     (dynamic-wind
-      (lambda () #f)
-      (lambda ()
-       (write-message `(:debug 0 ,level ,@(sldb-info (*sldb-state*) 0 20))
-                      socket)
-       (sldb-loop level socket))
-      (lambda ()
-       (write-message `(:debug-return 0 ,(- level 1) 'nil) socket))))))
+  (parameterize ((*sldb-state*
+                 (make-sldb-state condition (bound-restarts-for-emacs))))
+    (dynamic-wind
+     (lambda () #f)
+     (lambda ()
+       (write-message `(:debug 0 ,level ,@(sldb-info (*sldb-state*) 0 20))
+                     socket)
+       (sldb-loop level socket))
+     (lambda ()
+       (write-message `(:debug-return 0 ,(- level 1) 'nil) socket)))))
 
 (define (sldb-loop level socket)
   (write-message `(:debug-activate 0 ,level) socket)
@@ -772,15 +765,14 @@ swank:xref
     (cond ((debugging-info/compiled-code? expression)
           (write-string ";unknown compiled code" port))
          ((not (debugging-info/undefined-expression? expression))
-          (parameterize* (list (cons param:print-primitives-by-name? #t))
-            (lambda ()
-              (write
-               (unsyntax
-                (if (or (debugging-info/undefined-expression? subexpression)
-                        (debugging-info/unknown-expression? subexpression))
-                    expression
-                    subexpression))
-               port))))
+          (parameterize ((param:print-primitives-by-name? #t))
+            (write
+             (unsyntax
+              (if (or (debugging-info/undefined-expression? subexpression)
+                      (debugging-info/unknown-expression? subexpression))
+                  expression
+                  subexpression))
+             port)))
          ((debugging-info/noise? expression)
           (write-string ";" port)
           (write-string ((debugging-info/noise expression) #f)
@@ -1078,10 +1070,9 @@ swank:xref
         (stream (iline "block" (compiled-entry/block o))
                 (call-with-output-string
                   (lambda (port)
-                    (parameterize* (list (cons current-output-port port))
-                      (lambda ()
-                        ((environment-lookup #f 'compiler:disassemble)
-                         o)))))))))
+                    (parameterize ((current-output-port port))
+                      ((environment-lookup #f 'compiler:disassemble)
+                       o))))))))
 
 (define (inspect-code-block block)
   (let loop ((i (compiled-code-block/constants-start block)))
@@ -1092,10 +1083,9 @@ swank:xref
                (iline "env" (compiled-code-block/environment block))
                (call-with-output-string
                  (lambda (port)
-                   (parameterize* (list (cons current-output-port port))
-                     (lambda ()
-                       ((environment-lookup #f 'compiler:disassemble)
-                        block)))))))))
+                   (parameterize ((current-output-port port))
+                     ((environment-lookup #f 'compiler:disassemble)
+                      block))))))))
 
 (define (inspect-scode o)
   (stream (pprint-to-string o)))
@@ -1131,11 +1121,10 @@ swank:xref
 (define (pprint-to-string o)
   (call-with-output-string
     (lambda (p)
-      (parameterize* (list (cons param:printer-list-breadth-limit 10)
-                          (cons param:printer-list-depth-limit 4)
-                          (cons param:printer-string-length-limit 100))
-       (lambda ()
-         (pp o p))))))
+      (parameterize ((param:printer-list-breadth-limit 10)
+                    (param:printer-list-depth-limit 4)
+                    (param:printer-string-length-limit 100))
+       (pp o p)))))
 
 ;; quote keywords, t and nil
 (define (quote-special x)
index 81ce7c41ba0b863b7bfb0aa6d8fae28c259f0890..752b806e545bd4ea1b7cb8fa55137dce47387711 100644 (file)
@@ -52,8 +52,8 @@ USA.
   ((rdb:identifier-renamer (rename-db)) new-identifier))
 
 (define (with-identifier-renaming thunk)
-  (parameterize* (list (cons rename-db (initial-rename-db)))
-                (lambda () (post-process-output (thunk)))))
+  (parameterize ((rename-db (initial-rename-db)))
+    (post-process-output (thunk))))
 
 (define-deferred rename-db
   (make-unsettable-parameter 'unbound))
index 31c2ecb4c0b55569bdf1fdd2060d67b2ef327939..0dbaae9713e3bb89b75198eddabd0a78119336f8 100644 (file)
@@ -316,8 +316,8 @@ USA.
   (make-unsettable-parameter unspecific))
 
 (define (with-error-context form senv hist thunk)
-  (parameterize* (list (cons error-context (serror-ctx form senv hist)))
-                thunk))
+  (parameterize ((error-context (serror-ctx form senv hist)))
+    (thunk)))
 
 ;;; External signaller for macros.
 (define (syntax-error message . irritants)
index 33007cd4a51eea8567d1e7964f435c7edc2cd3c1..40977077d736e343d978fc11627d3c45a511b994 100644 (file)
@@ -788,33 +788,33 @@ USA.
   (current-input-port port))
 
 (define (with-input-from-port port thunk)
-  (parameterize* (list (cons current-input-port port))
-                thunk))
+  (parameterize ((current-input-port port))
+    (thunk)))
 
 (define (set-current-output-port! port)
   (current-output-port port))
 
 (define (with-output-to-port port thunk)
-  (parameterize* (list (cons current-output-port port))
-                thunk))
+  (parameterize ((current-output-port port))
+    (thunk)))
 
 (define (set-notification-output-port! port)
   (notification-output-port port))
 
 (define (with-notification-output-port port thunk)
-  (parameterize* (list (cons notification-output-port port))
-                thunk))
+  (parameterize ((notification-output-port port))
+    (thunk)))
 
 (define (set-trace-output-port! port)
   (trace-output-port port))
 
 (define (with-trace-output-port port thunk)
-  (parameterize* (list (cons trace-output-port port))
-                thunk))
+  (parameterize ((trace-output-port port))
+    (thunk)))
 
 (define (set-interaction-i/o-port! port)
   (interaction-i/o-port port))
 
 (define (with-interaction-i/o-port port thunk)
-  (parameterize* (list (cons interaction-i/o-port port))
-                thunk))
\ No newline at end of file
+  (parameterize ((interaction-i/o-port port))
+    (thunk)))
\ No newline at end of file
index 9c097fb618aeeb50d75c9cc4f429d30a75d35eaa..19c163e24265c64faf540eb471f946d19bf7dbb2 100644 (file)
@@ -259,8 +259,8 @@ USA.
       (error:wrong-type-argument continuation
                                 "continuation"
                                 with-create-thread-continuation))
-  (parameterize* (list (cons root-continuation-default continuation))
-    thunk))
+  (parameterize ((root-continuation-default continuation))
+    (thunk)))
 \f
 (define (current-thread)
   (or first-running-thread
index b9ac5e294fa70dd62ad8b293494c75862a08c47e..b535b53ffe33e97bcd24401f2a0d40d624f648ac 100644 (file)
@@ -45,9 +45,8 @@ USA.
 (define (unsyntax-with-substitutions scode alist)
   (if (not (alist? alist))
       (error:wrong-type-argument alist "alist" 'unsyntax-with-substitutions))
-  (parameterize* (list (cons substitutions alist))
-    (lambda ()
-      (unsyntax scode))))
+  (parameterize ((substitutions alist))
+    (unsyntax scode)))
 
 (define-integrable (maybe-substitute object thunk)
   (let ((association (has-substitution? object)))
index d57c77c441d1f81fcd79bfa213656ca6572b1247..35cd00ee2ef04e986569ddbc9b984710dc6d8a71 100644 (file)
@@ -56,10 +56,8 @@ USA.
             (merge-pathnames pathname directory-path))
           (let ((pathnames
                  (let ((fnames (generate-directory-pathnames directory-path)))
-                   (parameterize*
-                    (list (cons *expand-directory-prefixes?* false))
-                    (lambda ()
-                      (map ->pathname fnames))))))
+                   (parameterize ((*expand-directory-prefixes?* false))
+                     (map ->pathname fnames)))))
             (if (and (eq? (pathname-name pattern) 'wild)
                      (eq? (pathname-type pattern) 'wild))
                 pathnames
index 9f568840afbc0c5986a40e09cd11569e206c2499..a22c94e4249c6a0481e1ff9501fb67a99b50bfd2 100644 (file)
@@ -387,9 +387,9 @@ USA.
             unspecific))
         (lambda ()
           (let ((v
-                 (parameterize* (list (cons *notification-depth*
-                                            (1+ (*notification-depth*))))
-                   thunk)))
+                 (parameterize ((*notification-depth*
+                                 (1+ (*notification-depth*))))
+                   (thunk))))
             (set! done? #t)
             v))
         (lambda ()
index 33d1d462590ce0333ee99acf57105f35de656cfc..4e0c0d9223efb5dfd82a02409dd085ff5df6073b 100644 (file)
@@ -53,9 +53,8 @@ USA.
     (thread-report port)))
 
 (define (ticks->string ticks)
-  (parameterize* (list (cons param:flonum-printer-cutoff '(absolute 3)))
-    (lambda ()
-      (number->string (internal-time/ticks->seconds ticks) 10))))
+  (parameterize ((param:flonum-printer-cutoff '(absolute 3)))
+    (number->string (internal-time/ticks->seconds ticks) 10)))
 
 (define (write-time-interval secs port)
   (let ((min/sec (integer-divide secs 60)))
index 981ccd05511dea5c09d3db19d34427a349b7149e..b64ba58f5d1c03bbaaa4463d546dc92698e8fdcf 100644 (file)
@@ -75,9 +75,9 @@ USA.
 (define (with-working-directory-pathname name thunk)
   (let ((pathname (new-pathname name)))
     (fluid-let ((*default-pathname-defaults* pathname))
-      (parameterize* (list (cons param:default-pathname-defaults pathname)
-                          (cons working-directory-pathname pathname))
-       thunk))))
+      (parameterize ((param:default-pathname-defaults pathname)
+                    (working-directory-pathname pathname))
+       (thunk)))))
 
 (define (new-pathname name)
   (pathname-simplify
index 837266e4913fa8b87bff1afa003a5519eca1474e..60d0bf31094950bfd9edde0dd4c7618cc2be0f78 100644 (file)
@@ -247,8 +247,7 @@ USA.
 \f
 ;;; Debugging utility
 (define (pp-expression form #!optional port)
-  (parameterize* (list (cons param:pp-primitives-by-name? #f)
-                      (cons param:pp-uninterned-symbols-by-name? #f)
-                      (cons param:printer-abbreviate-quotations? #t))
-    (lambda ()
-      (pp (cgen/external-with-declarations form) port))))
\ No newline at end of file
+  (parameterize ((param:pp-primitives-by-name? #f)
+                (param:pp-uninterned-symbols-by-name? #f)
+                (param:printer-abbreviate-quotations? #t))
+    (pp (cgen/external-with-declarations form) port)))
\ No newline at end of file
index 4145492c4a9b42602722c148b1a80de3ee0321f1..9ae6a21d1d55e5687d948d150542d4be48cd620b 100644 (file)
@@ -262,15 +262,13 @@ USA.
   (let ((f1-time (run-test f1-test)))
     (let ((report
           (lambda (name time scale)
-            (parameterize* (list
-                            (cons param:flonum-printer-cutoff '(ABSOLUTE 2)))
-              (lambda ()
-                (newline)
-                (write name)
-                (write-string "-test:\t")
-                (write (exact->inexact time))
-                (write-string "\t")
-                (write (exact->inexact (/ (/ time scale) f1-time))))))))
+            (parameterize ((param:flonum-printer-cutoff '(absolute 2)))
+              (newline)
+              (write name)
+              (write-string "-test:\t")
+              (write (exact->inexact time))
+              (write-string "\t")
+              (write (exact->inexact (/ (/ time scale) f1-time)))))))
       (report 'f1 f1-time 1)
       (for-each (lambda (name test scale)
                  (report name (run-test test) scale))
index 7453975ad2f53fe103baee5ab262edabdffc2c58..75b2708537d39725e2a6b0ed44d387333ab67a9e 100644 (file)
@@ -76,14 +76,13 @@ USA.
   (let ((pathname (merge-pathnames pathname)))
     (with-working-directory-pathname (directory-pathname pathname)
       (lambda ()
-       (parameterize* (list (cons current-load-pathname pathname)
-                            (cons current-load-environment environment))
-         (lambda ()
-           (fluid-let ((*sabbr-table* (make-strong-eq-hash-table)))
-             (read-xml-file pathname
-                            `((scheme ,(pi-expander environment))
-                              (svar ,svar-expander)
-                              (sabbr ,sabbr-expander))))))))))
+       (parameterize ((current-load-pathname pathname)
+                      (current-load-environment environment))
+         (fluid-let ((*sabbr-table* (make-strong-eq-hash-table)))
+           (read-xml-file pathname
+                          `((scheme ,(pi-expander environment))
+                            (svar ,svar-expander)
+                            (sabbr ,sabbr-expander)))))))))
 \f
 (define (make-expansion-environment pathname)
   (let ((environment (extend-top-level-environment expander-environment)))
@@ -94,15 +93,14 @@ USA.
 
 (define ((pi-expander environment) text)
   (fluid-let ((*outputs* (cons '() '())))
-    (parameterize* (list (cons param:suppress-loading-message? #t))
-      (lambda ()
-       (let ((port (open-input-string text)))
-         (let loop ()
-           (let ((expression (read port)))
-             (if (not (eof-object? expression))
-                 (begin
-                   (expander-eval expression environment)
-                   (loop))))))))
+    (parameterize ((param:suppress-loading-message? #t))
+      (let ((port (open-input-string text)))
+       (let loop ()
+         (let ((expression (read port)))
+           (if (not (eof-object? expression))
+               (begin
+                 (expander-eval expression environment)
+                 (loop)))))))
     (car *outputs*)))
 
 (define expander-eval eval)
index 8933be6d02d3d4d05ac8df7a6f0dc8ed4d04da70..5039d4d288aaa7ea42757c44eaa339dfdc821870 100644 (file)
@@ -63,7 +63,6 @@ USA.
       (environment-define environment 'define-xmlrpc-method
        (lambda (name handler)
          (hash-table-set! methods name handler)))
-      (parameterize* (list (cons param:suppress-loading-message? #t))
-       (lambda ()
-         (load pathname environment))))
+      (parameterize ((param:suppress-loading-message? #t))
+       (load pathname environment)))
     (hash-table-ref/default methods name #f)))
\ No newline at end of file
index f1ddc971cee0bd936b47291de113ac2a9e125350..79cc5c0baf083cf65c2f9d777d87c397f34e4c7e 100644 (file)
@@ -284,9 +284,8 @@ USA.
 (define (write-expr-property tag p port)
   (write-tag tag port)
   (write-char #\space port)
-  (parameterize* (list (cons param:printer-abbreviate-quotations? #t))
-    (lambda ()
-      (write (cdr p) port))))
+  (parameterize ((param:printer-abbreviate-quotations? #t))
+    (write (cdr p) port)))
 
 (define (write-feature tag p port)
   (write-tag tag port)