diff options
author | Andy Wingo <wingo@pobox.com> | 2010-02-19 15:30:34 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-02-19 15:30:34 +0100 |
commit | ea6b18e82f3ac2122d07c80bc0f320ea839a25b6 (patch) | |
tree | cd5e3c02694e73a2453b1cc9d06f160580c5c92f /libguile/control.h | |
parent | f5b1f76af492f3c398527ee040e8bf09fc438a9a (diff) | |
download | guile-ea6b18e82f3ac2122d07c80bc0f320ea839a25b6.tar.gz |
prompt handlers are always inline
* libguile/control.h (SCM_F_PROMPT_INLINE, SCM_PROMPT_INLINE_P): Remove;
prompts always have "inline" handlers now.
* libguile/control.c (scm_c_make_prompt): Remove inline_handler_p arg.
* libguile/vm-i-system.c (prompt):
* module/language/assembly/decompile-bytecode.scm (decode-load-program):
* module/language/assembly/compile-bytecode.scm (write-bytecode):
Adapt to prompt changes.
* module/language/glil.scm (make-glil-prompt, glil-prompt-inline?):
Remove inline? flag.
(parse-glil, unparse-glil):
* module/language/glil/compile-assembly.scm (glil->assembly): Adapt to
<glil-prompt> change.
* module/language/tree-il/compile-glil.scm (flatten): Require the
handler of a <prompt> to be a lambda-case.
* module/language/tree-il/primitives.scm (*primitive-expand-table*):
Ensure that the handler of a <prompt> is a lambda-case.
* module/language/tree-il/inline.scm (inline!): Simplify a degenerate
case: (lambda args (apply (lambda ...) args)) => (lambda ...).
Diffstat (limited to 'libguile/control.h')
-rw-r--r-- | libguile/control.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libguile/control.h b/libguile/control.h index 9fe880b11..e95ef99ff 100644 --- a/libguile/control.h +++ b/libguile/control.h @@ -20,14 +20,12 @@ #define SCM_CONTROL_H -#define SCM_F_PROMPT_INLINE 0x1 -#define SCM_F_PROMPT_ESCAPE 0x2 +#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_INLINE_P(x) (SCM_PROMPT_FLAGS (x) & SCM_F_PROMPT_INLINE) #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_TAG(x) (SCM_CELL_OBJECT ((x), 1)) #define SCM_PROMPT_REGISTERS(x) ((struct scm_prompt_registers*)SCM_CELL_WORD ((x), 2)) #define SCM_PROMPT_DYNENV(x) (SCM_CELL_OBJECT ((x), 3)) #define SCM_PROMPT_HANDLER(x) (SCM_CELL_OBJECT ((x), 4)) @@ -44,7 +42,6 @@ struct scm_prompt_registers SCM_INTERNAL SCM scm_c_make_prompt (SCM vm, SCM k, SCM handler, - scm_t_uint8 inline_handler_p, scm_t_uint8 escape_only_p); |