From 3b4d7cdccce97dbffee538812c86bc03a6ae35d9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Apr 2020 14:17:36 +0200 Subject: bournish: Prevent inlining of run-time support procedures. On Guile 3, those procedures could be inlined, leading to unbound-variable errors: scheme@(guile-user)> ,bournish Welcome to Bournish, a minimal Bourne-like shell! To switch back, type `,L scheme'. bournish@(guile-user)> ls ice-9/boot-9.scm:1669:16: In procedure raise-exception: Unbound variable: ls-command-implementation Reported by Ricardo Wurmus. * guix/build/bournish.scm (define-command-runtime): New macro. (ls-command-implementation, wc-command-implementation) (wc-l-command-implementation, wc-c-command-implementation): Use it instead of 'define'. --- guix/build/bournish.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/guix/build/bournish.scm b/guix/build/bournish.scm index 247a687d80..31fc493b09 100644 --- a/guix/build/bournish.scm +++ b/guix/build/bournish.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2020 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus ;;; @@ -83,7 +83,21 @@ TERMINAL-WIDTH. Use COLUMN-GAP spaces between two subsequent columns." (newline) (loop (map 1+ indexes))))) -(define ls-command-implementation +(define-syntax define-command-runtime + (syntax-rules () + "Define run-time support of a Bournish command. This macro ensures that +the implementation is not subject to inlining, which would prevent compiled +code from referring to it via '@@'." + ((_ (command . args) body ...) + (define-command-runtime command (lambda args body ...))) + ((_ command exp) + (begin + (define command exp) + + ;; Prevent inlining of COMMAND. + (set! command command))))) + +(define-command-runtime ls-command-implementation ;; Run-time support procedure. (case-lambda (() @@ -173,13 +187,13 @@ TERMINAL-WIDTH. Use COLUMN-GAP spaces between two subsequent columns." (call-with-input-file file lines+chars))) (format #t "~a ~a~%" chars file))) -(define (wc-command-implementation . files) +(define-command-runtime (wc-command-implementation . files) (for-each wc-print (filter file-exists?* files))) -(define (wc-l-command-implementation . files) +(define-command-runtime (wc-l-command-implementation . files) (for-each wc-l-print (filter file-exists?* files))) -(define (wc-c-command-implementation . files) +(define-command-runtime (wc-c-command-implementation . files) (for-each wc-c-print (filter file-exists?* files))) (define (wc-command . args) -- cgit v1.2.3 ommit/gnu/packages/parallel.scm?id=70d6a614243cb8222f33a583be632d62f58817d2'>gnu: parallel: Update to 20190322....* gnu/packages/parallel.scm (parallel): Update to 20190322. Tobias Geerinckx-Rice 2019-02-24gnu: parallel: Update to 20190222....* gnu/packages/parallel.scm (parallel): Update to 20190222. Tobias Geerinckx-Rice 2019-02-12gnu: parallel: Update to 20190122....* gnu/packages/parallel.scm (parallel): Update to 20190122. Tobias Geerinckx-Rice 2018-12-24gnu: parallel: Update to 20181222....* gnu/packages/parallel.scm (parallel): Update to 20181222. Rutger Helling 2018-11-28gnu: parallel: Update to 20181122....* gnu/packages/parallel.scm (parallel): Update to 20181122. Efraim Flashner 2018-10-27gnu: parallel: Update to 20181022....* gnu/packages/parallel.scm (parallel): Update to 20181022. Tobias Geerinckx-Rice 2018-09-24gnu: parallel: Update to 20180922....* gnu/packages/parallel.scm (parallel): Update to 20180922. Tobias Geerinckx-Rice 2018-08-24gnu: parallel: Update to 20180822....* gnu/packages/parallel.scm (parallel): Update to 20180822. Ludovic Courtès 2018-07-30gnu: parallel: Update to 20180722....* gnu/packages/parallel.scm (parallel): Update to 20180722. Efraim Flashner 2018-06-22gnu: parallel: Remove 'bash' input....Because it's implicit. * gnu/packages/parallel.scm (parallel)[inputs]: Remove 'bash'. Clément Lassieur 2018-06-22gnu: parallel: Wrap program instead of substituting 'ps' and 'perl'....* gnu/packages/parallel.scm (parallel)[arguments]: Replace 'ps' and 'perl' substitutions with a 'wrap-program' phase. Move the 'post-install-test' phase after it. [inputs]: Add bash. Clément Lassieur 2018-06-21gnu: parallel: Update to 20180622....* gnu/packages/parallel.scm (parallel): Update to 20180622. Clément Lassieur