From 2f18850268548525bcd87c3851584b772ccb159e Mon Sep 17 00:00:00 2001 From: AlexKnauth Date: Tue, 5 Jan 2016 17:40:16 -0500 Subject: [PATCH] move join functions for lists and hash tables --- lens/private/compound/join-string.rkt | 2 +- lens/private/compound/join-vector.rkt | 2 +- lens/private/compound/main.rkt | 2 -- lens/private/compound/main.scrbl | 2 -- lens/private/{compound => hash}/join-hash.rkt | 2 +- lens/private/{compound => hash}/join-hash.scrbl | 0 lens/private/hash/main.rkt | 1 + lens/private/hash/main.scrbl | 1 + lens/private/hash/pick.rkt | 2 +- lens/private/{compound => list}/join-assoc.rkt | 4 ++-- lens/private/{compound => list}/join-list.rkt | 0 lens/private/{compound => list}/join-list.scrbl | 2 ++ lens/private/list/main.rkt | 1 + lens/private/list/main.scrbl | 1 + lens/private/list/multi.rkt | 1 + unstable/lens/join-assoc.rkt | 2 +- 16 files changed, 14 insertions(+), 11 deletions(-) rename lens/private/{compound => hash}/join-hash.rkt (97%) rename lens/private/{compound => hash}/join-hash.scrbl (100%) rename lens/private/{compound => list}/join-assoc.rkt (92%) rename lens/private/{compound => list}/join-list.rkt (100%) rename lens/private/{compound => list}/join-list.scrbl (94%) diff --git a/lens/private/compound/join-string.rkt b/lens/private/compound/join-string.rkt index a57ed67..fb823ed 100644 --- a/lens/private/compound/join-string.rkt +++ b/lens/private/compound/join-string.rkt @@ -6,7 +6,7 @@ require racket/contract "../util/immutable.rkt" "../util/rest-contract.rkt" "compose.rkt" - "join-list.rkt" + "../list/join-list.rkt" module+ test require rackunit diff --git a/lens/private/compound/join-vector.rkt b/lens/private/compound/join-vector.rkt index ccb0742..cdeb799 100644 --- a/lens/private/compound/join-vector.rkt +++ b/lens/private/compound/join-vector.rkt @@ -6,7 +6,7 @@ require racket/contract "../util/immutable.rkt" "../util/rest-contract.rkt" "compose.rkt" - "join-list.rkt" + "../list/join-list.rkt" module+ test require rackunit diff --git a/lens/private/compound/main.rkt b/lens/private/compound/main.rkt index f6367be..af12e49 100644 --- a/lens/private/compound/main.rkt +++ b/lens/private/compound/main.rkt @@ -1,8 +1,6 @@ #lang reprovide "compose.rkt" "identity.rkt" -"join-hash.rkt" -"join-list.rkt" "join-string.rkt" "join-vector.rkt" "thrush.rkt" diff --git a/lens/private/compound/main.scrbl b/lens/private/compound/main.scrbl index 802b238..1ef5319 100644 --- a/lens/private/compound/main.scrbl +++ b/lens/private/compound/main.scrbl @@ -6,7 +6,5 @@ @scribble-include/no-subsection["compose.scrbl"] @scribble-include/no-subsection["thrush.scrbl"] -@scribble-include/no-subsection["join-list.scrbl"] -@scribble-include/no-subsection["join-hash.scrbl"] @scribble-include/no-subsection["join-vector.scrbl"] @scribble-include/no-subsection["join-string.scrbl"] diff --git a/lens/private/compound/join-hash.rkt b/lens/private/hash/join-hash.rkt similarity index 97% rename from lens/private/compound/join-hash.rkt rename to lens/private/hash/join-hash.rkt index 095ed55..23603eb 100644 --- a/lens/private/compound/join-hash.rkt +++ b/lens/private/hash/join-hash.rkt @@ -8,7 +8,7 @@ "../util/alternating-list.rkt" "../util/immutable.rkt" "../util/list-pair-contract.rkt" - "join-list.rkt") + "../list/join-list.rkt") (module+ test (require rackunit diff --git a/lens/private/compound/join-hash.scrbl b/lens/private/hash/join-hash.scrbl similarity index 100% rename from lens/private/compound/join-hash.scrbl rename to lens/private/hash/join-hash.scrbl diff --git a/lens/private/hash/main.rkt b/lens/private/hash/main.rkt index 678fed5..d96bf76 100644 --- a/lens/private/hash/main.rkt +++ b/lens/private/hash/main.rkt @@ -2,3 +2,4 @@ "nested.rkt" "pick.rkt" "ref.rkt" +"join-hash.rkt" diff --git a/lens/private/hash/main.scrbl b/lens/private/hash/main.scrbl index b0c466e..758a3f0 100644 --- a/lens/private/hash/main.scrbl +++ b/lens/private/hash/main.scrbl @@ -10,3 +10,4 @@ @scribble-include/no-subsection["ref.scrbl"] @scribble-include/no-subsection["nested.scrbl"] @scribble-include/no-subsection["pick.scrbl"] +@scribble-include/no-subsection["join-hash.scrbl"] diff --git a/lens/private/hash/pick.rkt b/lens/private/hash/pick.rkt index 260c96a..179d70a 100644 --- a/lens/private/hash/pick.rkt +++ b/lens/private/hash/pick.rkt @@ -3,7 +3,7 @@ (require racket/contract racket/list "../base/main.rkt" - "../compound/join-hash.rkt" + "../hash/join-hash.rkt" "../util/immutable.rkt" "../util/rest-contract.rkt" "ref.rkt") diff --git a/lens/private/compound/join-assoc.rkt b/lens/private/list/join-assoc.rkt similarity index 92% rename from lens/private/compound/join-assoc.rkt rename to lens/private/list/join-assoc.rkt index 32e76ae..42ab20d 100644 --- a/lens/private/compound/join-assoc.rkt +++ b/lens/private/list/join-assoc.rkt @@ -6,14 +6,14 @@ provide lens-join/assoc (->* [] #:rest (listof2 any/c lens?) (lens/c any/c (listof pair?))) require lens/private/base/main - lens/private/compound/join-list + lens/private/list/join-list lens/private/list/assoc lens/private/util/alternating-list lens/private/util/list-pair-contract racket/match unstable/sequence module+ test - require rackunit lens/private/list/main + require rackunit lens/private/list/list-ref-take-drop (define (lens-join/assoc . ks/lenses) (define-values [keys lenses] diff --git a/lens/private/compound/join-list.rkt b/lens/private/list/join-list.rkt similarity index 100% rename from lens/private/compound/join-list.rkt rename to lens/private/list/join-list.rkt diff --git a/lens/private/compound/join-list.scrbl b/lens/private/list/join-list.scrbl similarity index 94% rename from lens/private/compound/join-list.scrbl rename to lens/private/list/join-list.scrbl index e9f9cd1..f80316e 100644 --- a/lens/private/compound/join-list.scrbl +++ b/lens/private/list/join-list.scrbl @@ -2,6 +2,8 @@ @(require "../doc-util/main.rkt") +@title{Joining lenses to view lists} + @defproc[(lens-join/list [lens lens?] ...) lens?]{ Constructs a lens that combines the view of each @racket[lens] into a list of views. This lens can diff --git a/lens/private/list/main.rkt b/lens/private/list/main.rkt index 5c61c69..fb7cf2b 100644 --- a/lens/private/list/main.rkt +++ b/lens/private/list/main.rkt @@ -3,4 +3,5 @@ "list-ref-take-drop.rkt" "cadr-etc.rkt" "multi.rkt" +"join-list.rkt" "assoc.rkt" diff --git a/lens/private/list/main.scrbl b/lens/private/list/main.scrbl index 48a84a6..b8427ef 100644 --- a/lens/private/list/main.scrbl +++ b/lens/private/list/main.scrbl @@ -8,4 +8,5 @@ @include-section["car-cdr.scrbl"] @include-section["list-ref-take-drop.scrbl"] +@include-section["join-list.scrbl"] @include-section["assoc.scrbl"] diff --git a/lens/private/list/multi.rkt b/lens/private/list/multi.rkt index 4f67d8e..f8419b1 100644 --- a/lens/private/list/multi.rkt +++ b/lens/private/list/multi.rkt @@ -4,6 +4,7 @@ "../base/main.rkt" "../compound/main.rkt" "../util/rest-contract.rkt" + "join-list.rkt" "list-ref-take-drop.rkt") (module+ test diff --git a/unstable/lens/join-assoc.rkt b/unstable/lens/join-assoc.rkt index 7cfbde7..7c909eb 100644 --- a/unstable/lens/join-assoc.rkt +++ b/unstable/lens/join-assoc.rkt @@ -1,2 +1,2 @@ #lang reprovide -lens/private/compound/join-assoc +lens/private/list/join-assoc