mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

with-continuation-barrier carps, calls exit(3) _after_ unwinding

Browse source 
* libguile/continuations.c (scm_handler, c_handler)
  (scm_c_with_continuation_barrier, scm_with_continuation_barrier): Call
  scm_handle_by_message_noexit in the post-unwind handler, so that
  dynwinds

* test-suite/tests/continuations.test ("continuations"): Add a test.
This commit is contained in:
Andy Wingo 2011-03-24 20:20:14 +01:00
parent ad301b6d58
commit ecba00af65
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libguile/continuations.c
View file

@ -477,7 +477,13 @@ c_body (void *d)
static SCM static SCM
c_handler (void *d, SCM tag, SCM args) c_handler (void *d, SCM tag, SCM args)
{ {
struct c_data *data = (struct c_data *)d; struct c_data *data;
/* Print a message. Note that if TAG is `quit', this will exit() the
process. */
scm_handle_by_message_noexit (NULL, tag, args);
data = (struct c_data *)d;
data->result = NULL; data->result = NULL;
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
@ -490,7 +496,7 @@ scm_c_with_continuation_barrier (void *(*func) (void *), void *data)
c_data.data = data; c_data.data = data;
scm_i_with_continuation_barrier (c_body, &c_data, scm_i_with_continuation_barrier (c_body, &c_data,
c_handler, &c_data, c_handler, &c_data,
scm_handle_by_message_noexit, NULL); NULL, NULL);
return c_data.result; return c_data.result;
} }
@ -508,6 +514,10 @@ scm_body (void *d)
static SCM static SCM
scm_handler (void *d, SCM tag, SCM args) scm_handler (void *d, SCM tag, SCM args)
{ {
/* Print a message. Note that if TAG is `quit', this will exit() the
process. */
scm_handle_by_message_noexit (NULL, tag, args);
return SCM_BOOL_F; return SCM_BOOL_F;
} }
@ -529,7 +539,7 @@ SCM_DEFINE (scm_with_continuation_barrier, "with-continuation-barrier", 1,0,0,
scm_data.proc = proc; scm_data.proc = proc;
return scm_i_with_continuation_barrier (scm_body, &scm_data, return scm_i_with_continuation_barrier (scm_body, &scm_data,
scm_handler, &scm_data, scm_handler, &scm_data,
scm_handle_by_message_noexit, NULL); NULL, NULL);
} }
#undef FUNC_NAME #undef FUNC_NAME

13
test-suite/tests/continuations.test
View file

@ -1,7 +1,7 @@
;;;; -*- scheme -*- ;;;; -*- scheme -*-
;;;; continuations.test --- test suite for continutations ;;;; continuations.test --- test suite for continutations
;;;; ;;;;
;;;; Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc. ;;;; Copyright (C) 2003, 2006, 2009, 2011 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -80,6 +80,17 @@
(error "Catch me if you can!"))))))))) (error "Catch me if you can!")))))))))
handled)) handled))
(pass-if "exit unwinds dynwinds inside a continuation barrier"
(let ((s (with-error-to-string
(lambda ()
(with-continuation-barrier
(lambda ()
(dynamic-wind
(lambda () #f)
(lambda () (exit 1))
(lambda () (throw 'abcde)))))))))
(and (string-contains s "abcde") #t)))
(with-debugging-evaluator (with-debugging-evaluator
(pass-if "make a stack from a continuation" (pass-if "make a stack from a continuation"