prompt as part of guile's primitive language

[bpt/guile.git] / module / ice-9 / control.scm

diff --git a/module/ice-9/control.scm b/module/ice-9/control.scm
index 75e9d37..a621e8d 100644 (file)
--- a/module/ice-9/control.scm
+++ b/module/ice-9/control.scm
@@ -19,24 +19,14 @@
 ;;; Code:
 
 (define-module (ice-9 control)
-  #:use-module (language tree-il primitives)
-  #:export (% prompt control))
+  #:re-export (prompt)
+  #:export (% control))
 
-(eval-when (eval load compile)
-  (load-extension "libguile" "scm_init_control")
-  (add-interesting-primitive! '@prompt)
-  (add-interesting-primitive! '@control)
+;; the same as abort.
+(define (control tag . args)
+  (apply abort tag args))
 
-  (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))
+(define-syntax %
+  (syntax-rules ()
+    ((_ expr handler)
+     (prompt (lambda () expr) handler))))