summaryrefslogtreecommitdiff
path: root/libguile/init.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-02-19 22:44:24 +0100
committerAndy Wingo <wingo@pobox.com>2010-02-19 22:44:24 +0100
commit747022e4cb5faef6e0a2c73f046bacd93bb99ab8 (patch)
treeb37adc0822d4dafd24f6d8ee4ce1ac340ac56d45 /libguile/init.c
parent0bc8874c0461d532ca0251cf20af9bc5193b3cfa (diff)
downloadguile-747022e4cb5faef6e0a2c73f046bacd93bb99ab8.tar.gz
prompt as part of guile's primitive language
* libguile/control.h: * libguile/control.c: Remove scm_atcontrol and scm_atprompt. (scm_c_make_prompt): Remove handler arg, as the handler is inline. (scm_abort): New primitive, exported to Scheme as `abort'. The compiler will also recognize calls to `abort', but this is the base case. (scm_init_control): Remove scm_register_control, just have this function, which adds `abort' to the `(guile)' module. * libguile/eval.c (eval): Add SCM_M_PROMPT case. * libguile/init.c (scm_i_init_guile): Change scm_register_control call into a nice orderly scm_init_control call. * libguile/memoize.h: (scm_sym_at_prompt, SCM_M_PROMPT): * libguile/memoize.c (MAKMEMO_PROMPT, scm_m_at_prompt, unmemoize): Add prompt support to the memoizer. * libguile/vm-i-system.c (prompt): Fix to not expect a handler on the stack. * module/ice-9/boot-9.scm (prompt): Add definition in terms of @prompt. * module/ice-9/control.scm: Simplify, and don't play with the compiler here, now that prompt and abort are primitive. * module/ice-9/eval.scm (primitive-eval): Add a prompt case. * module/language/tree-il/primitives.scm (*interesting-primitive-names*): Add @prompt and prompt.
Diffstat (limited to 'libguile/init.c')
-rw-r--r--libguile/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/init.c b/libguile/init.c
index 1288f7f77..e72b9460f 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -454,7 +454,6 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_bootstrap_programs ();
scm_bootstrap_vm ();
scm_register_foreign ();
- scm_register_control ();
scm_init_strings (); /* Requires array-handle */
scm_init_struct (); /* Requires strings */
@@ -471,6 +470,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_async (); /* requires smob_prehistory */
scm_init_boolean ();
scm_init_chars ();
+ scm_init_control ();
#ifdef GUILE_DEBUG_MALLOC
scm_init_debug_malloc ();
#endif