From 83d250c357347ddfb53cdad12078ff5f90ca07f0 Mon Sep 17 00:00:00 2001 From: AlexKnauth Date: Tue, 7 Jul 2015 20:11:56 -0400 Subject: [PATCH] change argument order of lens-transfrom fixes https://github.com/jackfirth/lens/issues/72 --- info.rkt | 2 +- lens/base/transform.rkt | 6 +++--- lens/base/transform.scrbl | 6 +++--- lens/list/cadr-etc.rkt | 2 +- lens/list/car-cdr.scrbl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/info.rkt b/info.rkt index 4e93708..37e1dbe 100644 --- a/info.rkt +++ b/info.rkt @@ -3,7 +3,7 @@ (define collection 'multi) -(define version "0.3") +(define version "0.4") (define deps diff --git a/lens/base/transform.rkt b/lens/base/transform.rkt index c2ead00..0ea3f7e 100644 --- a/lens/base/transform.rkt +++ b/lens/base/transform.rkt @@ -11,7 +11,7 @@ lens-transform*) -(define (lens-transform lens f v) +(define (lens-transform lens v f) (let-lens (view setter) lens v (setter (f view)))) @@ -19,7 +19,7 @@ (define (set-first l v) (list* v (rest l))) (define first-lens (make-lens first set-first)) - (check-equal? (lens-transform first-lens number->string '(1 2 3)) + (check-equal? (lens-transform first-lens '(1 2 3) number->string) '("1" 2 3))) @@ -30,7 +30,7 @@ lenses/fs)) (for/fold ([v v]) ([lens/f (in-slice 2 lenses/fs)]) (match-define (list lens f) lens/f) - (lens-transform lens f v))) + (lens-transform lens v f))) (module+ test (define (set-second l v) diff --git a/lens/base/transform.scrbl b/lens/base/transform.scrbl index e1e64aa..3ce57f5 100644 --- a/lens/base/transform.scrbl +++ b/lens/base/transform.scrbl @@ -10,8 +10,8 @@ @title{Transforming Values With Lenses} @defproc[(lens-transform [lens lens?] - [transformer (-> view/c view/c)] - [target target/c]) + [target target/c] + [transformer (-> view/c view/c)]) target/c]{ Transforms the view of @racket[target] through the given @racket[lens] with the @racket[transformer] function. Equivalent to getting the @@ -20,7 +20,7 @@ to the return value of calling @racket[transformer] with the old view. @lenses-examples[ - (lens-transform first-lens number->string '(1 2 3)) + (lens-transform first-lens '(1 2 3) number->string) ]} @defproc[(lens-transform* [target target/c] [lens lens?] [transformer (-> view/c view/c)] ... ...) diff --git a/lens/list/cadr-etc.rkt b/lens/list/cadr-etc.rkt index eb0e3c1..60cbe37 100644 --- a/lens/list/cadr-etc.rkt +++ b/lens/list/cadr-etc.rkt @@ -57,5 +57,5 @@ ddaa ddad ddda dddd) (module+ test - (check-equal? (lens-transform cdaddr-lens list->vector '(9 8 (6 5 4 3 2 1) 7)) + (check-equal? (lens-transform cdaddr-lens '(9 8 (6 5 4 3 2 1) 7) list->vector) '(9 8 (6 . #(5 4 3 2 1)) 7))) diff --git a/lens/list/car-cdr.scrbl b/lens/list/car-cdr.scrbl index 9d29290..9d84538 100644 --- a/lens/list/car-cdr.scrbl +++ b/lens/list/car-cdr.scrbl @@ -44,5 +44,5 @@ @lenses-examples[ (cdaddr '(9 8 (6 5 4 3 2 1) 7)) (lens-view cdaddr-lens '(9 8 (6 5 4 3 2 1) 7)) - (lens-transform cdaddr-lens list->vector '(9 8 (6 5 4 3 2 1) 7)) + (lens-transform cdaddr-lens '(9 8 (6 5 4 3 2 1) 7) list->vector) ]}