14aa25e410
* libguile/debug.h (scm_t_debug_frame): Remove this type, as it was
internal to the old evaluator.
(SCM_EVALFRAME, SCM_APPLYFRAME, SCM_VOIDFRAME, SCM_MACROEXPF)
(SCM_TAILREC, SCM_TRACED_FRAME, SCM_ARGS_READY, SCM_DOVERFLOW)
(SCM_MAX_FRAME_SIZE, SCM_FRAMETYPE)
(SCM_EVALFRAMEP, SCM_APPLYFRAMEP, SCM_VOIDFRAMEP, SCM_MACROEXPFP)
(SCM_TAILRECP, SCM_TRACED_FRAME_P, SCM_ARGS_READY_P, SCM_OVERFLOWP)
(SCM_SET_MACROEXP, SCM_SET_TAILREC, SCM_SET_TRACED_FRAME)
(SCM_SET_ARGSREADY, SCM_SET_OVERFLOW)
(SCM_CLEAR_MACROEXP, SCM_CLEAR_TRACED_FRAME, SCM_CLEAR_ARGSREADY):
Remove macro accessors to scm_t_debug_frame.
(SCM_DEBUGOBJP, SCM_DEBUGOBJ_FRAME, SCM_SET_DEBUGOBJ_FRAME):
(scm_debug_object_p, scm_make_debugobj): Remove debugobj accessors.
(scm_i_unmemoize_expr): Remove unused declaration.
* libguile/debug.c (scm_debug_options): No more max limit on frame
sizes.
(scm_start_stack): Just call out to scm_vm_call_with_new_stack.
(scm_debug_object_p, scm_make_debugobj, scm_init_debug): No more
debugobj smob type.
* libguile/deprecated.h:
* libguile/deprecated.c (scm_i_deprecated_last_debug_frame)
(scm_last_debug_frame): Remove deprecated debug-frame bits.
* libguile/stacks.c (scm_make_stack): Rework this function and its
dependents to only walk VM frames.
(scm_stack_id): Call out to the holder of the VM frame in question,
which should be a VM or a VM continuation, for the stack ID. Currently
this bit is stubbed out.
(scm_last_stack_frame): Removed. It seems this is mainly useful for a
debugger, and we need to rewrite the debugger to work on the Scheme
level.
* test-suite/tests/continuations.test ("continuations"): Remove test for
last-stack-frame.
* libguile/continuations.h (struct scm_t_contregs):
* libguile/continuations.c (scm_make_continuation):
(copy_stack_and_call, scm_i_with_continuation_barrier): No need to
save and restore debug frames.
* libguile/threads.h (scm_i_thread): Don't track debug frames.
(scm_i_last_debug_frame, scm_i_set_last_debug_frame): Remove macro
accessors.
* libguile/threads.c (guilify_self_1): Don't track debug frames.
* libguile/throw.c: No need to track debug frames in a jmpbuf.
* libguile/vm-engine.c (vm_engine, VM_PUSH_DEBUG_FRAMES): Don't push
debug frames.
* libguile/vm.h:
* libguile/vm.c (scm_vm_call_with_new_stack): New function. Currently
stubbed out though.
92 lines
2.6 KiB
Scheme
92 lines
2.6 KiB
Scheme
;;;; -*- scheme -*-
|
|
;;;; continuations.test --- test suite for continutations
|
|
;;;;
|
|
;;;; Copyright (C) 2003, 2006, 2009 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
|
|
|
|
(define-module (test-suite test-continuations)
|
|
:use-module (test-suite lib))
|
|
|
|
(define (block-reentry body)
|
|
(let ((active #f))
|
|
(dynamic-wind
|
|
(lambda ()
|
|
(if active
|
|
(throw 'no-reentry)))
|
|
(lambda ()
|
|
(set! active #t)
|
|
(body))
|
|
(lambda () #f))))
|
|
|
|
(define (catch-tag body)
|
|
(catch #t
|
|
body
|
|
(lambda (tag . args) tag)))
|
|
|
|
(define (check-cont)
|
|
(catch-tag
|
|
(lambda ()
|
|
(block-reentry (lambda () (call/cc identity))))))
|
|
|
|
(define (dont-crash-please)
|
|
(let ((k (check-cont)))
|
|
(if (procedure? k)
|
|
(k 12)
|
|
k)))
|
|
|
|
(with-test-prefix "continuations"
|
|
|
|
(pass-if "throwing to a rewound catch context"
|
|
(eq? (dont-crash-please) 'no-reentry))
|
|
|
|
(pass-if "can print a continuation"
|
|
(let ((s (with-output-to-string
|
|
(lambda ()
|
|
(call-with-current-continuation write)))))
|
|
(string=? "#<continuation " (substring s 0 15))))
|
|
|
|
(pass-if "blocked attempt to cross a continuation barrier"
|
|
(call-with-current-continuation
|
|
(lambda (k)
|
|
(with-continuation-barrier
|
|
(lambda ()
|
|
(catch 'misc-error
|
|
(lambda ()
|
|
(k 1)
|
|
#f)
|
|
(lambda _
|
|
#t)))))))
|
|
|
|
(pass-if "uncaught exception is handled by continuation barrier"
|
|
(let* ((handled #f)
|
|
(s (with-error-to-string
|
|
(lambda ()
|
|
(set! handled
|
|
(not (with-continuation-barrier
|
|
(lambda ()
|
|
(error "Catch me if you can!")))))))))
|
|
handled))
|
|
|
|
(with-debugging-evaluator
|
|
|
|
(pass-if "make a stack from a continuation"
|
|
(stack? (call-with-current-continuation make-stack)))
|
|
|
|
(pass-if "get a continuation's stack ID"
|
|
(let ((id (call-with-current-continuation stack-id)))
|
|
(or (boolean? id) (symbol? id)))))
|
|
|
|
)
|