From 4fb7d3744fa9fda3a3fef74f297a12142e94fe81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 13 Jan 2020 03:00:26 +0100 Subject: Multiple values for let-env. --- module/util.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'module/util.scm') diff --git a/module/util.scm b/module/util.scm index 910a2400..31fd9997 100644 --- a/module/util.scm +++ b/module/util.scm @@ -389,14 +389,19 @@ -;; TODO multiple values (define-syntax let-env (syntax-rules () - [(_ ((name value)) + [(_ ((name value) ...) body ...) - (let ((sname (symbol->string (quote name)))) - (let ((ogenv (getenv sname))) - (setenv sname value) - (let ((return (begin body ...))) - (setenv sname ogenv) - return)))])) + + (let ((env-pairs + (map (lambda (n new-value) + (list n new-value (getenv n))) + (list (symbol->string (quote name)) ...) + (list value ...)))) + (for-each (lambda (pair) (setenv (car pair) (cadr pair))) + env-pairs) + (let ((return (begin body ...))) + (for-each (lambda (pair) (setenv (car pair) (caddr pair))) + env-pairs) + return))])) -- cgit v1.2.3