From 4b76acfa38d6939241e0b4cfdbbc46e8aac13e1a Mon Sep 17 00:00:00 2001 From: "Chris K. Jester-Young" Date: Fri, 5 Apr 2013 13:31:12 -0400 Subject: [PATCH] Revert "Add record type printers for srfi-41 and srfi-45." This reverts commit 4a1cdc9d5d643d05fa7a18febc7c12070f3ef6d9, which was prematurely pushed. --- module/srfi/srfi-41.scm | 23 +---------------------- module/srfi/srfi-45.scm | 8 +------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/module/srfi/srfi-41.scm b/module/srfi/srfi-41.scm index 243bd445d..edf95d7d9 100644 --- a/module/srfi/srfi-41.scm +++ b/module/srfi/srfi-41.scm @@ -27,7 +27,6 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-8) #:use-module (srfi srfi-9) - #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:export (stream-null stream-cons stream? stream-null? stream-pair? @@ -149,7 +148,7 @@ (define stream? stream-promise?) -(define %stream-null (cons 'stream 'null)) +(define %stream-null '(stream . null)) (define stream-null (stream-eager %stream-null)) (define (stream-null? obj) @@ -181,26 +180,6 @@ (define-syntax-rule (stream-lambda formals body0 body1 ...) (lambda formals (stream-lazy (begin body0 body1 ...)))) -(set-record-type-printer! stream-promise - (lambda (strm port) - (display "# port) - (let* ((kar (stream-kar pare)) - (kar-value (stream-promise-val kar))) - (write-char #\space port) - (case (stream-value-tag kar-value) - ((eager) (write (stream-value-proc kar-value) port)) - ((lazy) (write-char #\? port))) - (loop (stream-kdr pare)))))) - ((lazy) - (display " ...>" port)))))) - ;;; Derived stream functions and macros: (streams derived) (define-syntax-rule (define-stream (name . formal) body0 body1 ...) diff --git a/module/srfi/srfi-45.scm b/module/srfi/srfi-45.scm index ae08f9b92..51947700c 100644 --- a/module/srfi/srfi-45.scm +++ b/module/srfi/srfi-45.scm @@ -39,8 +39,7 @@ eager promise?) #:replace (delay force promise?) - #:use-module (srfi srfi-9) - #:use-module (srfi srfi-9 gnu)) + #:use-module (srfi srfi-9)) (cond-expand-provide (current-module) '(srfi-45)) @@ -77,8 +76,3 @@ ;; (*) These two lines re-fetch and check the original promise in case ;; the first line of the let* caused it to be forced. For an example ;; where this happens, see reentrancy test 3 below. - -(set-record-type-printer! promise - (lambda (promise port) - (define content (promise-val promise)) - (format port "#<~a ~s>" (value-tag content) (value-proc content)))) -- 2.20.1