bug#40647: closed ([PATCH] shepherd: remove local call/ec definition.)

[GNU bug Tracking System]

Your message dated Thu, 16 Apr 2020 18:18:16 +0200
with message-id <address@hidden>
and subject line Re: [bug#40647] [PATCH] shepherd: remove local call/ec 
definition.
has caused the debbugs.gnu.org bug report #40647,
regarding [PATCH] shepherd: remove local call/ec definition.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
40647: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40647
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] shepherd: remove local call/ec definition.
>
>
>
>
> Date: 
>
> Wed, 15 Apr 2020 20:09:58 +0200
>
>
>
>
> Tests pass with guile 2.2 and 3.0.
> I haven't test it with guile 2.0 version.
>
> * modules/shepherd/args.scm(module): import (ice-9 control) module.
> * modules/shepherd/service.scm: Likewise.
> * modules/shepherd/support.scm(call/ec): remove call/ec definition and
>   his exportation.
> ---
>  modules/shepherd/args.scm    |  1 +
>  modules/shepherd/service.scm |  1 +
>  modules/shepherd/support.scm | 13 -------------
>  3 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/modules/shepherd/args.scm b/modules/shepherd/args.scm
> index 604768f..b98f29c 100644
> --- a/modules/shepherd/args.scm
> +++ b/modules/shepherd/args.scm
> @@ -20,6 +20,7 @@
>  (define-module (shepherd args)
>    #:use-module (oop goops)
>    #:use-module (srfi srfi-1)
> +  #:use-module ((ice-9 control) #:select (call/ec))
>    #:use-module (shepherd support)
>    #:use-module (shepherd config)
>    #:export (<option>
> diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
> index fc82cc4..88b5c07 100644
> --- a/modules/shepherd/service.scm
> +++ b/modules/shepherd/service.scm
> @@ -29,6 +29,7 @@
>    #:use-module (srfi srfi-34)
>    #:use-module (srfi srfi-35)
>    #:use-module (rnrs io ports)
> +  #:use-module ((ice-9 control) #:select (call/ec))
>    #:use-module (ice-9 match)
>    #:use-module (ice-9 format)
>    #:autoload   (ice-9 pretty-print) (truncated-print)
> diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
> index 1f73f6b..cdb7b35 100644
> --- a/modules/shepherd/support.scm
> +++ b/modules/shepherd/support.scm
> @@ -25,7 +25,6 @@
>    #:use-module (ice-9 match)
>    #:export (buffering-mode
>  
> -            call/ec
>              caught-error
>              assert
>              label
> @@ -80,18 +79,6 @@
>      ((_ none)
>       (if-2.0 _IONBF 'none))))
>  
> -;; Implement `call-with-escape-continuation' with `catch' and `throw'.
> -;; FIXME: Multiple return values.
> -(define (call/ec proc)
> -  (let* ((catch-sym (gensym))
> -        (escape (lambda (value)
> -                  (throw catch-sym value))))
> -    (catch catch-sym
> -      (lambda ()
> -       (proc escape))
> -      (lambda (sym value)
> -       value))))
> -
>  ;; Report the caught error.
>  ;; FIXME: Needs some more work.
>  (define (caught-error key args)
> -- 
> 2.25.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#40647] [PATCH] shepherd: remove local call/ec definition.
>
>
>
>
> Date: 
>
> Thu, 16 Apr 2020 18:18:16 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
>
>
>
>
> Hi,
>
> guy fleury iteriteka <address@hidden> skribis:
>
> > Tests pass with guile 2.2 and 3.0.
> > I haven't test it with guile 2.0 version.
>
> 2.0 has ‘call/ec’ as well, so it should be fine.
>
> > * modules/shepherd/args.scm(module): import (ice-9 control) module.
> > * modules/shepherd/service.scm: Likewise.
> > * modules/shepherd/support.scm(call/ec): remove call/ec definition and
> >   his exportation.
>
> I adjusted the commit log and pushed, thanks!
>
> Ludo’.
>
>
> --- End Message ---