diff options
author | Andy Wingo <wingo@pobox.com> | 2010-03-09 22:24:25 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-03-09 22:24:25 +0100 |
commit | 8fc43b12c71789030d9058fea8b6eff5490dec27 (patch) | |
tree | 8be9a06a17cf3107875dec709993d0c8df22f5ac /module/language/tree-il/primitives.scm | |
parent | a6cd35551023d72703cf05a98e42e9dd6a75d48f (diff) | |
download | guile-8fc43b12c71789030d9058fea8b6eff5490dec27.tar.gz |
prompt, abort -> call-with-prompt, abort-to-prompt
* module/ice-9/boot-9.scm (default-prompt-tag, make-prompt-tag): New
functions.
(call-with-prompt, abort-to-prompt): Rename from `prompt' and `abort',
respectively. These names are more clear, and allow `prompt' and
`abort' to have more convenient, less general bindings.
(default-throw-handler, custom-throw-handler, catch, %start-stack):
Adapt callers.
* module/ice-9/control.scm: Adapt re-export list.
(control): Remove binding, until we're sure that it is Sitaram's
control.
(abort): New binding, aborts to the nearest prompt with the default
tag.
(%): Use call-with-prompt.
* module/language/tree-il/primitives.scm (*primitive-expand-table*):
(*interesting-primitive-names*): Adapt for prompt/abort changes.
* test-suite/tests/control.test: Take advantage of the defaults for %
and abort.
Diffstat (limited to 'module/language/tree-il/primitives.scm')
-rw-r--r-- | module/language/tree-il/primitives.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/language/tree-il/primitives.scm b/module/language/tree-il/primitives.scm index 43e53f45e..b6953cabe 100644 --- a/module/language/tree-il/primitives.scm +++ b/module/language/tree-il/primitives.scm @@ -63,7 +63,7 @@ fluid-ref fluid-set! - @prompt prompt @abort abort + @prompt call-with-prompt @abort abort-to-prompt struct? struct-vtable make-struct struct-ref struct-set! @@ -454,7 +454,7 @@ (else #f))) (hashq-set! *primitive-expand-table* - 'prompt + 'call-with-prompt (case-lambda ((src tag thunk handler) ;; Sigh. Until the inliner does its job, manually inline @@ -482,7 +482,7 @@ (make-abort src tag '() tail-args)) (else #f))) (hashq-set! *primitive-expand-table* - 'abort + 'abort-to-prompt (case-lambda ((src tag . args) (make-abort src tag args (make-const #f '()))) |