From ea6b18e82f3ac2122d07c80bc0f320ea839a25b6 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 19 Feb 2010 15:30:34 +0100 Subject: 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 change. * module/language/tree-il/compile-glil.scm (flatten): Require the handler of a to be a lambda-case. * module/language/tree-il/primitives.scm (*primitive-expand-table*): Ensure that the handler of a is a lambda-case. * module/language/tree-il/inline.scm (inline!): Simplify a degenerate case: (lambda args (apply (lambda ...) args)) => (lambda ...). --- module/language/assembly/compile-bytecode.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/language/assembly/compile-bytecode.scm') diff --git a/module/language/assembly/compile-bytecode.scm b/module/language/assembly/compile-bytecode.scm index 98fb27fed..5c0e11533 100644 --- a/module/language/assembly/compile-bytecode.scm +++ b/module/language/assembly/compile-bytecode.scm @@ -119,8 +119,7 @@ ((br-if-nargs-lt ,hi ,lo ,l) (write-byte hi) (write-byte lo) (write-break l)) ((br-if-nargs-gt ,hi ,lo ,l) (write-byte hi) (write-byte lo) (write-break l)) ((mv-call ,n ,l) (write-byte n) (write-break l)) - ((prompt ,inline-handler? ,escape-only? ,l) - (write-byte inline-handler?) (write-byte escape-only?) (write-break l)) + ((prompt ,escape-only? ,l) (write-byte escape-only?) (write-break l)) (else (cond ((< (instruction-length inst) 0) -- cgit v1.2.3