--- /dev/null
+;;; Beyond call/cc
+
+;; Copyright (C) 2010 Free Software Foundation, Inc.
+
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+;;; Code:
+
+(define-module (ice-9 control)
+ #:use-module (language tree-il primitives)
+ #:export (% prompt control))
+
+(eval-when (eval load compile)
+ (load-extension "libguile" "scm_init_control")
+ (add-interesting-primitive! '@prompt)
+ (add-interesting-primitive! '@control)
+
+ (define (prompt tag thunk handler)
+ (@prompt tag thunk handler #f))
+
+ (define (control tag . args)
+ (apply @control tag 'throw args))
+
+ (define-syntax %
+ (syntax-rules ()
+ ((_ expr handler)
+ (prompt (lambda () expr) handler))))
+
+ (add-interesting-primitive! 'prompt)
+ (add-interesting-primitive! 'control))
((symbol? in) `(cons* ,@(reverse out) ,in))
((pair? (car in))
(lp (cdr in)
- (cons `(make-application src (make-primitive-ref src ',(caar in))
- ,(inline-args (cdar in)))
+ (cons (if (eq? (caar in) 'quote)
+ `(make-const src ,@(cdar in))
+ `(make-application src (make-primitive-ref src ',(caar in))
+ ,(inline-args (cdar in))))
out)))
((symbol? (car in))
;; assume it's locally bound
(lp (cdr in) (cons (car in) out)))
- ((number? (car in))
+ ((self-evaluating? (car in))
(lp (cdr in) (cons `(make-const src ,(car in)) out)))
(else
(error "what what" (car in))))))
(make-application #f (make-lexical-ref #f 'thunk THUNK) '())
(make-lexical-ref #f 'post POST)))))))
(else #f)))
+
+(hashq-set! *primitive-expand-table*
+ 'prompt
+ (case-lambda
+ ((src tag thunk handler)
+ (make-prompt src tag (make-application #f thunk '())
+ handler #f))
+ ((src tag thunk handler pre)
+ (make-prompt src tag (make-application #f thunk '())
+ handler pre))
+ (else #f)))
+(hashq-set! *primitive-expand-table*
+ '@prompt
+ (case-lambda
+ ((src tag thunk handler pre)
+ (make-prompt src tag (make-application #f thunk '())
+ handler pre))
+ (else #f)))
+
+(hashq-set! *primitive-expand-table*
+ 'control
+ (case-lambda
+ ((src tag . args)
+ (make-control src tag 'throw args))
+ (else #f)))
+(hashq-set! *primitive-expand-table*
+ '@control
+ (case-lambda
+ ((src tag type . args)
+ (make-control src tag (if (const? type) (const-exp type) (error "what ho" type)) args))
+ (else #f)))