summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2013-03-26 21:31:30 -0400
committerMark H Weaver <mhw@netris.org>2013-03-26 21:34:46 -0400
commit8a2ba669530856410a2e63d449b8d199f5c21649 (patch)
treebf7c0145d85cea6a9bbcce79e2a77158b0faf63c
parent8a77cefe174c28e282d8431be9a1168af2c50021 (diff)
downloadguile-srfi-41.tar.gz
SRFI-41: Remove multiple-value support from embedded copy of SRFI-45.srfi-41
* module/srfi/srfi-41.scm: Remove 2013 from list of FSF copyright dates on the embedded copy of SRFI-45. (stream-eager, stream-delay, stream-force): Revert changes that added multiple value-support to the embedded copy of SRFI-45.
-rw-r--r--module/srfi/srfi-41.scm12
1 files changed, 5 insertions, 7 deletions
diff --git a/module/srfi/srfi-41.scm b/module/srfi/srfi-41.scm
index 6a5af7749..edf95d7d9 100644
--- a/module/srfi/srfi-41.scm
+++ b/module/srfi/srfi-41.scm
@@ -87,7 +87,7 @@
;; properly: <http://bugs.gnu.org/13995>. So for now, we duplicate the
;; code.
-;; Copyright (C) 2010, 2011, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Copyright (C) 2003 André van Tonder. All Rights Reserved.
;; Permission is hereby granted, free of charge, to any person
@@ -120,18 +120,16 @@
(define-syntax-rule (stream-lazy exp)
(make-stream-promise (make-stream-value 'lazy (lambda () exp))))
-(define (stream-eager . xs)
- (make-stream-promise (make-stream-value 'eager xs)))
+(define (stream-eager x)
+ (make-stream-promise (make-stream-value 'eager x)))
(define-syntax-rule (stream-delay exp)
- (stream-lazy (call-with-values
- (lambda () exp)
- stream-eager)))
+ (stream-lazy (stream-eager exp)))
(define (stream-force promise)
(let ((content (stream-promise-val promise)))
(case (stream-value-tag content)
- ((eager) (apply values (stream-value-proc content)))
+ ((eager) (stream-value-proc content))
((lazy) (let* ((promise* ((stream-value-proc content)))
(content (stream-promise-val promise)))
(if (not (eqv? (stream-value-tag content) 'eager))