* [PATCH 1/2] utils: Fix default-keyword-arguments.
@ 2016-09-20 21:29 Eric Bavier
2016-09-20 21:29 ` [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments Eric Bavier
2016-09-24 2:16 ` [PATCH 1/2] utils: Fix default-keyword-arguments Ludovic Courtès
0 siblings, 2 replies; 6+ messages in thread
From: Eric Bavier @ 2016-09-20 21:29 UTC (permalink / raw)
To: guix-devel; +Cc: Eric Bavier
From: Eric Bavier <bavier@member.fsf.org>
* guix/utils.scm (default-keyword-arguments): Properly test for present
keywords.
* tests/utils.scm (default-keyword-arguments): New test.
---
guix/utils.scm | 2 +-
tests/utils.scm | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index c68094c..ded3114 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -369,7 +369,7 @@ keywords not already present in ARGS."
(match defaults
((kw value rest ...)
(loop rest
- (if (assoc-ref kw args)
+ (if (memq kw args)
args
(cons* kw value args))))
(()
diff --git a/tests/utils.scm b/tests/utils.scm
index 6590ed9..960928c 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -111,6 +111,18 @@
(ensure-keyword-arguments '(#:foo 2) '(#:bar 3))
(ensure-keyword-arguments '(#:foo 2) '(#:bar 3 #:foo 42))))
+(test-equal "default-keyword-arguments"
+ '((#:foo 2)
+ (#:foo 2)
+ (#:foo 2 #:bar 3)
+ (#:foo 2 #:bar 3)
+ (#:foo 2 #:bar 3))
+ (list (default-keyword-arguments '() '(#:foo 2))
+ (default-keyword-arguments '(#:foo 2) '(#:foo 4))
+ (default-keyword-arguments '() '(#:bar 3 #:foo 2))
+ (default-keyword-arguments '(#:bar 3) '(#:foo 2))
+ (default-keyword-arguments '(#:foo 2 #:bar 3) '(#:bar 6))))
+
(test-assert "filtered-port, file"
(let* ((file (search-path %load-path "guix.scm"))
(input (open-file file "r0b")))
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments.
2016-09-20 21:29 [PATCH 1/2] utils: Fix default-keyword-arguments Eric Bavier
@ 2016-09-20 21:29 ` Eric Bavier
2016-09-24 2:21 ` Ludovic Courtès
2016-09-24 2:16 ` [PATCH 1/2] utils: Fix default-keyword-arguments Ludovic Courtès
1 sibling, 1 reply; 6+ messages in thread
From: Eric Bavier @ 2016-09-20 21:29 UTC (permalink / raw)
To: guix-devel; +Cc: Eric Bavier
From: Eric Bavier <bavier@member.fsf.org>
* guix/utils.scm (substitute-keyword-arguments): Allow default value
declarations.
* tests/utils.scm (substitute-keyword-arguments): New test.
---
guix/utils.scm | 34 ++++++++++++++++++++--------------
tests/utils.scm | 20 ++++++++++++++++++++
2 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index ded3114..1fd6725 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -376,21 +376,27 @@ keywords not already present in ARGS."
args))))
(define-syntax substitute-keyword-arguments
- (syntax-rules ()
+ (lambda (x)
"Return a new list of arguments where the value for keyword arg KW is
-replaced by EXP. EXP is evaluated in a context where VAR is boud to the
-previous value of the keyword argument."
- ((_ original-args ((kw var) exp) ...)
- (let loop ((args original-args)
- (before '()))
- (match args
- ((kw var rest (... ...))
- (loop rest (cons* exp kw before)))
- ...
- ((x rest (... ...))
- (loop rest (cons x before)))
- (()
- (reverse before)))))))
+replaced by EXP. EXP is evaluated in a context where VAR is bound to the
+previous value of the keyword argument, or DFLT if given."
+ (syntax-case x ()
+ ((_ original-args ((kw var dflt ...) exp) ...)
+ #`(let loop ((args (default-keyword-arguments
+ original-args
+ (list #,@(append-map (match-lambda
+ ((k) '())
+ (x x))
+ #'((kw dflt ...) ...)))))
+ (before '()))
+ (match args
+ ((kw var rest (... ...))
+ (loop rest (cons* exp kw before)))
+ ...
+ ((x rest (... ...))
+ (loop rest (cons x before)))
+ (()
+ (reverse before))))))))
(define (delkw kw lst)
"Remove KW and its associated value from LST, a keyword/value list such
diff --git a/tests/utils.scm b/tests/utils.scm
index 960928c..bcfaa14 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -123,6 +123,26 @@
(default-keyword-arguments '(#:bar 3) '(#:foo 2))
(default-keyword-arguments '(#:foo 2 #:bar 3) '(#:bar 6))))
+(test-equal "substitute-keyword-arguments"
+ '((#:foo 3)
+ (#:foo 3)
+ (#:foo 3 #:bar (1 2))
+ (#:bar (1 2) #:foo 3)
+ (#:foo 3))
+ (list (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo f) (1+ f)))
+ (substitute-keyword-arguments '()
+ ((#:foo f 2) (1+ f)))
+ (substitute-keyword-arguments '(#:foo 2 #:bar (2))
+ ((#:foo f) (1+ f))
+ ((#:bar b) (cons 1 b)))
+ (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo _) 3)
+ ((#:bar b '(2)) (cons 1 b)))
+ (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo f 1) (1+ f))
+ ((#:bar b) (cons 42 b)))))
+
(test-assert "filtered-port, file"
(let* ((file (search-path %load-path "guix.scm"))
(input (open-file file "r0b")))
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] utils: Fix default-keyword-arguments.
2016-09-20 21:29 [PATCH 1/2] utils: Fix default-keyword-arguments Eric Bavier
2016-09-20 21:29 ` [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments Eric Bavier
@ 2016-09-24 2:16 ` Ludovic Courtès
1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-24 2:16 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel, Eric Bavier
Eric Bavier <ericbavier@openmailbox.org> skribis:
> From: Eric Bavier <bavier@member.fsf.org>
>
> * guix/utils.scm (default-keyword-arguments): Properly test for present
> keywords.
> * tests/utils.scm (default-keyword-arguments): New test.
Good catch, please push!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments.
2016-09-20 21:29 ` [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments Eric Bavier
@ 2016-09-24 2:21 ` Ludovic Courtès
2016-09-26 4:08 ` Eric Bavier
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-24 2:21 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel, Eric Bavier
Eric Bavier <ericbavier@openmailbox.org> skribis:
> From: Eric Bavier <bavier@member.fsf.org>
>
> * guix/utils.scm (substitute-keyword-arguments): Allow default value
> declarations.
> * tests/utils.scm (substitute-keyword-arguments): New test.
Good idea!
[...]
> +replaced by EXP. EXP is evaluated in a context where VAR is bound to the
> +previous value of the keyword argument, or DFLT if given."
> + (syntax-case x ()
> + ((_ original-args ((kw var dflt ...) exp) ...)
> + #`(let loop ((args (default-keyword-arguments
> + original-args
> + (list #,@(append-map (match-lambda
> + ((k) '())
> + (x x))
> + #'((kw dflt ...) ...)))))
> + (before '()))
I would prefer to stick to ‘syntax-rules’ when matching the clauses,
with a helper macro:
(define-syntax expand-default-args
(syntax-rules ()
((_ original args ((kw var) expr) rest ...)
...)
((_ original args ((kw var default) expr) rest ...)
...)))
…
(syntax-rules ()
((_ original-args ((clause exp) ...)
(let loop ((args (expand-default-args original-args clause ...)))
…))))
But this would be a bonus; the patch LGTM.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments.
2016-09-24 2:21 ` Ludovic Courtès
@ 2016-09-26 4:08 ` Eric Bavier
2016-09-30 20:24 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Eric Bavier @ 2016-09-26 4:08 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
On Sat, 24 Sep 2016 11:21:40 +0900
ludo@gnu.org (Ludovic Courtès) wrote:
>
> > +replaced by EXP. EXP is evaluated in a context where VAR is bound to the
> > +previous value of the keyword argument, or DFLT if given."
> > + (syntax-case x ()
> > + ((_ original-args ((kw var dflt ...) exp) ...)
> > + #`(let loop ((args (default-keyword-arguments
> > + original-args
> > + (list #,@(append-map (match-lambda
> > + ((k) '())
> > + (x x))
> > + #'((kw dflt ...) ...)))))
> > + (before '()))
>
> I would prefer to stick to ‘syntax-rules’ when matching the clauses,
> with a helper macro:
Right, I was wanting to do that, but was having a difficult time
working with mixed cases, where some keywords are declared with a
default and others are not.
> But this would be a bonus;
How about this patch instead?
`~Eric
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-utils-Support-defaults-in-substitute-keyword-argumen.patch --]
[-- Type: text/x-patch, Size: 3230 bytes --]
From 9481121fef60f0c3f4ea0f742d77336906771167 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 20 Sep 2016 15:41:31 -0500
Subject: [PATCH] utils: Support defaults in substitute-keyword-arguments.
* guix/utils.scm (collect-default-args, expand-default-args): New
syntax.
(substitute-keyword-arguments): Allow default value declarations.
* tests/utils.scm (substitute-keyword-arguments): New test.
---
guix/utils.scm | 29 +++++++++++++++++++++++++----
tests/utils.scm | 20 ++++++++++++++++++++
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index ded3114..cbad4ea 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -375,13 +375,34 @@ keywords not already present in ARGS."
(()
args))))
+(define-syntax collect-default-args
+ (syntax-rules ()
+ ((_ (_ _))
+ (list))
+ ((_ (kw _ dflt))
+ (list kw dflt))
+ ((_ (_ _) rest ...)
+ (collect-default-args rest ...))
+ ((_ (kw _ dflt) rest ...)
+ (cons* kw dflt (collect-default-args rest ...)))))
+
+(define-syntax expand-default-args
+ (syntax-rules ()
+ ((_ original-args (kw var) ...)
+ original-args)
+ ((_ original-args clause ...)
+ (default-keyword-arguments
+ original-args
+ (collect-default-args clause ...)))))
+
(define-syntax substitute-keyword-arguments
(syntax-rules ()
"Return a new list of arguments where the value for keyword arg KW is
-replaced by EXP. EXP is evaluated in a context where VAR is boud to the
-previous value of the keyword argument."
- ((_ original-args ((kw var) exp) ...)
- (let loop ((args original-args)
+replaced by EXP. EXP is evaluated in a context where VAR is bound to the
+previous value of the keyword argument, or DFLT if given."
+ ((_ original-args ((kw var dflt ...) exp) ...)
+ (let loop ((args (expand-default-args original-args
+ (kw var dflt ...) ...))
(before '()))
(match args
((kw var rest (... ...))
diff --git a/tests/utils.scm b/tests/utils.scm
index 960928c..bcfaa14 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -123,6 +123,26 @@
(default-keyword-arguments '(#:bar 3) '(#:foo 2))
(default-keyword-arguments '(#:foo 2 #:bar 3) '(#:bar 6))))
+(test-equal "substitute-keyword-arguments"
+ '((#:foo 3)
+ (#:foo 3)
+ (#:foo 3 #:bar (1 2))
+ (#:bar (1 2) #:foo 3)
+ (#:foo 3))
+ (list (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo f) (1+ f)))
+ (substitute-keyword-arguments '()
+ ((#:foo f 2) (1+ f)))
+ (substitute-keyword-arguments '(#:foo 2 #:bar (2))
+ ((#:foo f) (1+ f))
+ ((#:bar b) (cons 1 b)))
+ (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo _) 3)
+ ((#:bar b '(2)) (cons 1 b)))
+ (substitute-keyword-arguments '(#:foo 2)
+ ((#:foo f 1) (1+ f))
+ ((#:bar b) (cons 42 b)))))
+
(test-assert "filtered-port, file"
(let* ((file (search-path %load-path "guix.scm"))
(input (open-file file "r0b")))
--
2.9.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments.
2016-09-26 4:08 ` Eric Bavier
@ 2016-09-30 20:24 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-30 20:24 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
Eric Bavier <ericbavier@openmailbox.org> skribis:
> On Sat, 24 Sep 2016 11:21:40 +0900
> ludo@gnu.org (Ludovic Courtès) wrote:
>>
>> > +replaced by EXP. EXP is evaluated in a context where VAR is bound to the
>> > +previous value of the keyword argument, or DFLT if given."
>> > + (syntax-case x ()
>> > + ((_ original-args ((kw var dflt ...) exp) ...)
>> > + #`(let loop ((args (default-keyword-arguments
>> > + original-args
>> > + (list #,@(append-map (match-lambda
>> > + ((k) '())
>> > + (x x))
>> > + #'((kw dflt ...) ...)))))
>> > + (before '()))
>>
>> I would prefer to stick to ‘syntax-rules’ when matching the clauses,
>> with a helper macro:
[...]
> From 9481121fef60f0c3f4ea0f742d77336906771167 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 20 Sep 2016 15:41:31 -0500
> Subject: [PATCH] utils: Support defaults in substitute-keyword-arguments.
>
> * guix/utils.scm (collect-default-args, expand-default-args): New
> syntax.
> (substitute-keyword-arguments): Allow default value declarations.
> * tests/utils.scm (substitute-keyword-arguments): New test.
[...]
> +(define-syntax collect-default-args
> + (syntax-rules ()
> + ((_ (_ _))
> + (list))
> + ((_ (kw _ dflt))
> + (list kw dflt))
> + ((_ (_ _) rest ...)
> + (collect-default-args rest ...))
> + ((_ (kw _ dflt) rest ...)
> + (cons* kw dflt (collect-default-args rest ...)))))
I think you just need the base case (zero args), the default-value case,
and the no-default-value case:
(define-syntax collect-default-args
(syntax-rules ()
((_) ;done
'())
((_ (kw var) rest ...)
(collect-default-args rest ...))
((_ (kw var dflt) rest ...)
(cons* kw dflt (collect-default-args rest ...)))))
> +(define-syntax expand-default-args
> + (syntax-rules ()
> + ((_ original-args (kw var) ...)
> + original-args)
> + ((_ original-args clause ...)
> + (default-keyword-arguments
> + original-args
> + (collect-default-args clause ...)))))
AFAICS this macro can be removed altogether.
OK with changes along these lines, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-30 20:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-20 21:29 [PATCH 1/2] utils: Fix default-keyword-arguments Eric Bavier
2016-09-20 21:29 ` [PATCH 2/2] utils: Support defaults in substitute-keyword-arguments Eric Bavier
2016-09-24 2:21 ` Ludovic Courtès
2016-09-26 4:08 ` Eric Bavier
2016-09-30 20:24 ` Ludovic Courtès
2016-09-24 2:16 ` [PATCH 1/2] utils: Fix default-keyword-arguments Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).