diff options
author | Mark H Weaver <mhw@netris.org> | 2013-03-26 21:16:26 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-03-26 21:16:26 -0400 |
commit | 65ad02b96d4118970406b1474aa00bbe801aa61a (patch) | |
tree | 4fd4dc1f6d9a933c789ae7c672311c5a39990633 /module/srfi/srfi-45.scm | |
parent | 59b0f9d7635ea7e272e2976ab69764a570d7f6ff (diff) | |
download | guile-65ad02b96d4118970406b1474aa00bbe801aa61a.tar.gz |
Revert "SRFI-45: Support multiple values; add promise? predicate."
This reverts commit 1d64b4edb9da4011ad06c0fab1c6225ec20b0876.
Diffstat (limited to 'module/srfi/srfi-45.scm')
-rw-r--r-- | module/srfi/srfi-45.scm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/module/srfi/srfi-45.scm b/module/srfi/srfi-45.scm index f865f912c..7b7fedd88 100644 --- a/module/srfi/srfi-45.scm +++ b/module/srfi/srfi-45.scm @@ -1,6 +1,6 @@ ;;; srfi-45.scm -- Primitives for Expressing Iterative Lazy Algorithms -;; 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 @@ -25,8 +25,8 @@ ;;; Commentary: -;; This is the code of the reference implementation of SRFI-45, -;; modified to use SRFI-9 and to support multiple values. +;; This is the code of the reference implementation of SRFI-45, slightly +;; modified to use SRFI-9. ;; This module is documented in the Guile Reference Manual. @@ -36,9 +36,8 @@ #:export (delay lazy force - eager - promise?) - #:replace (delay force promise?) + eager) + #:replace (delay force) #:use-module (srfi srfi-9)) (cond-expand-provide (current-module) '(srfi-45)) @@ -53,18 +52,16 @@ (define-syntax-rule (lazy exp) (make-promise (make-value 'lazy (lambda () exp)))) -(define (eager . xs) - (make-promise (make-value 'eager xs))) +(define (eager x) + (make-promise (make-value 'eager x))) (define-syntax-rule (delay exp) - (lazy (call-with-values - (lambda () exp) - eager))) + (lazy (eager exp))) (define (force promise) (let ((content (promise-val promise))) (case (value-tag content) - ((eager) (apply values (value-proc content))) + ((eager) (value-proc content)) ((lazy) (let* ((promise* ((value-proc content))) (content (promise-val promise))) ; * (if (not (eqv? (value-tag content) 'eager)) ; * |