mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-03 13:20:26 +02:00
adbdfd6d24
* libguile/control.h (SCM_PROMPT_HANDLER): Remove, it was unused.
(SCM_PROMPT_DYNWINDS): Rename from SCM_PROMPT_DYNENV.
* libguile/control.c: (scm_c_make_prompt): Take another arg, the winds
that are to be in place for the prompt. Fix allocation to be 4 words
instead of 5 (the handler was never used).
* libguile/eval.c (eval):
* libguile/throw.c (pre_init_catch): Adapt to scm_c_make_prompt change.
* libguile/vm-i-system.c (partial-cont-call): Grovel the new elements of
the wind list in order to call setjmp() on the new prompts. Pass
cookie to vm_reinstate_partial_continuation.
(prompt): Adapt to scm_c_make_prompt change.
* libguile/vm.c (vm_reinstate_partial_continuation): Take a cookie arg,
used when winding captured prompts onto the stack. Winding a prompt
implies making a new prompt, actually -- with new registers, a new
jump buffer, new winds, etc.
* test-suite/tests/control.test ("rewinding prompts"): Add a test for
rewinding prompts.
62 lines
2.1 KiB
C
62 lines
2.1 KiB
C
/* 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
|
|
*/
|
|
|
|
#ifndef SCM_CONTROL_H
|
|
#define SCM_CONTROL_H
|
|
|
|
|
|
#define SCM_F_PROMPT_ESCAPE 0x1
|
|
|
|
#define SCM_PROMPT_P(x) (!SCM_IMP (x) && SCM_TYP7(x) == scm_tc7_prompt)
|
|
#define SCM_PROMPT_FLAGS(x) (SCM_CELL_WORD ((x), 0) >> 8)
|
|
#define SCM_PROMPT_ESCAPE_P(x) (SCM_PROMPT_FLAGS (x) & SCM_F_PROMPT_ESCAPE)
|
|
#define SCM_PROMPT_TAG(x) (SCM_CELL_OBJECT ((x), 1))
|
|
#define SCM_PROMPT_REGISTERS(x) ((struct scm_prompt_registers*)SCM_CELL_WORD ((x), 2))
|
|
#define SCM_PROMPT_DYNWINDS(x) (SCM_CELL_OBJECT ((x), 3))
|
|
|
|
#define SCM_PROMPT_SETJMP(p) (SCM_I_SETJMP (SCM_PROMPT_REGISTERS (p)->regs))
|
|
|
|
struct scm_prompt_registers
|
|
{
|
|
scm_t_uint8 *ip;
|
|
SCM *sp;
|
|
SCM *fp;
|
|
scm_t_int64 cookie;
|
|
scm_i_jmp_buf regs;
|
|
};
|
|
|
|
|
|
SCM_INTERNAL SCM scm_sys_default_prompt_tag;
|
|
|
|
|
|
SCM_INTERNAL SCM scm_c_make_prompt (SCM k, SCM *fp, SCM *sp,
|
|
scm_t_uint8 *abort_ip,
|
|
scm_t_uint8 escape_only_p,
|
|
scm_t_int64 vm_cookie,
|
|
SCM winds);
|
|
SCM_INTERNAL SCM scm_i_prompt_pop_abort_args_x (SCM prompt);
|
|
|
|
SCM_INTERNAL void scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv,
|
|
scm_t_int64 cookie) SCM_NORETURN;
|
|
SCM_INTERNAL SCM scm_at_abort (SCM tag, SCM args) SCM_NORETURN;
|
|
|
|
|
|
SCM_INTERNAL void scm_init_control (void);
|
|
|
|
|
|
#endif /* SCM_CONTROL_H */
|