Merge pull request #180 from jackfirth/177-private

177 private

lens/applicable.rkt

@@ -3,7 +3,7 @@
 (provide (all-from-out "main.rkt"))
 
 (require "main.rkt"
-         (only-in "base/base.rkt" use-applicable-lenses!))
+         (only-in "private/base/base.rkt" use-applicable-lenses!))
 
 (module+ test
   (require rackunit))

lens/applicable.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "doc-util/main.rkt")
+@(require "private/doc-util/main.rkt")
 
 
 @title{Applicable lenses}

lens/main.rkt

@@ -1,30 +1,7 @@
 #lang sweet-exp racket/base
 
-require
+require "private/main.rkt"
-  "base/main.rkt"
-  "compound/main.rkt"
-  "dict.rkt"
-  "hash/main.rkt"
-  "list/main.rkt"
-  "stream.rkt"
-  "string.rkt"
-  "struct/main.rkt"
-  "vector/main.rkt"
 
 provide
-  except-out
+  all-from-out
-    all-from-out
+    "private/main.rkt"
-      "base/main.rkt"
-      "compound/main.rkt"
-      "dict.rkt"
-      "hash/main.rkt"
-      "list/main.rkt"
-      "stream.rkt"
-      "string.rkt"
-      "struct/main.rkt"
-      "vector/main.rkt"
-    gen:lens
-    focus-lens
-    drop-lens
-    take-lens
-    use-applicable-lenses!

lens/main.scrbl

@@ -16,13 +16,13 @@ source code: @url["https://github.com/jackfirth/lens"]
 
 @local-table-of-contents[]
 
-@include-section["base/main.scrbl"]
+@include-section["private/base/main.scrbl"]
-@include-section["compound/main.scrbl"]
+@include-section["private/compound/main.scrbl"]
-@include-section["list/main.scrbl"]
+@include-section["private/list/main.scrbl"]
-@include-section["hash/main.scrbl"]
+@include-section["private/hash/main.scrbl"]
-@include-section["struct/main.scrbl"]
+@include-section["private/struct/main.scrbl"]
-@include-section["vector/main.scrbl"]
+@include-section["private/vector/main.scrbl"]
-@include-section["string.scrbl"]
+@include-section["private/string.scrbl"]
-@include-section["stream.scrbl"]
+@include-section["private/stream.scrbl"]
-@include-section["dict.scrbl"]
+@include-section["private/dict.scrbl"]
 @include-section["applicable.scrbl"]

lens/private/base/contract.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require "../doc-util/main.rkt")
 
 @title{Lens Contracts}
 

lens/private/compound/main.rkt

@@ -12,6 +12,7 @@ require
 provide
   all-from-out
     "compose.rkt"
+    "identity.rkt"
     "join-hash.rkt"
     "join-list.rkt"
     "join-string.rkt"

lens/private/main.rkt

@@ -0,0 +1,30 @@
+#lang sweet-exp racket/base
+
+require
+  "base/main.rkt"
+  "compound/main.rkt"
+  "dict.rkt"
+  "hash/main.rkt"
+  "list/main.rkt"
+  "stream.rkt"
+  "string.rkt"
+  "struct/main.rkt"
+  "vector/main.rkt"
+
+provide
+  except-out
+    all-from-out
+      "base/main.rkt"
+      "compound/main.rkt"
+      "dict.rkt"
+      "hash/main.rkt"
+      "list/main.rkt"
+      "stream.rkt"
+      "string.rkt"
+      "struct/main.rkt"
+      "vector/main.rkt"
+    gen:lens
+    focus-lens
+    drop-lens
+    take-lens
+    use-applicable-lenses!

lens/private/struct/struct.rkt

@@ -1,8 +1,8 @@
 #lang racket/base
 
 (require syntax/parse/define
-         lens/base/main
          alexis/util/struct
+         "../base/main.rkt"
          (submod alexis/util/struct get-struct-accessors)
          (for-syntax racket/base
                      syntax/parse

unstable/lens/arrow.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{lens-view/thrush, lens-set/thrush, and lens-transform/thrush}
 

unstable/lens/if.rkt

@@ -5,13 +5,13 @@
          lens-match
          )
 
-(require lens/base/main
+(require lens/private/base/main
          racket/match
          (for-syntax racket/base
                      syntax/parse
                      ))
 (module+ test
-  (require rackunit lens/list/main lens/vector/main lens/string))
+  (require rackunit lens/private/list/main lens/private/vector/main lens/private/string))
 
 (define (lens-if pred lens1 lens2)
   (make-lens

unstable/lens/isomorphism.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Isomorphisms}
 

unstable/lens/isomorphism/base.rkt

@@ -1,3 +1,4 @@
+
 #lang sweet-exp racket/base
 
 provide isomorphism-lens?
@@ -6,7 +7,7 @@ provide isomorphism-lens?
                    [isomorphism-lenses make-isomorphism-lenses]
 
 require racket/match
-        lens/base/gen-lens
+        lens/private/base/gen-lens
 
 
 (struct isomorphism-lens (f inv) #:transparent

unstable/lens/isomorphism/data.rkt

@@ -9,7 +9,7 @@ provide string->symbol-lens
         list->string-lens
         string->list-lens
 
-require lens/base/main
+require lens/private/base/main
         "base.rkt"
 
 module+ test

unstable/lens/list.rkt

@@ -7,9 +7,9 @@ provide
     reverse-lens (lens/c list? list?)
     last-lens (lens/c list? any/c)
 
-require lens/base/main
+require lens/private/base/main
-        lens/list/main
+        lens/private/list/main
-        lens/compound/main
+        lens/private/compound/main
         "isomorphism/base.rkt"
 
 module+ test

unstable/lens/mapper.rkt

@@ -8,13 +8,13 @@
            (-> lens? (lens/c immutable-vector? immutable-vector?))]
           ))
 
-(require lens/base/main
+(require lens/private/base/main
-         lens/util/immutable
+         lens/private/util/immutable
          racket/vector
          fancy-app
          )
 (module+ test
-  (require rackunit lens/list/main))
+  (require rackunit lens/private/list/main))
 
 (define (mapper-lens lens)
   (make-lens

unstable/lens/mapper.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Lenses that map over lists and vectors}
 

unstable/lens/match.rkt

@@ -5,10 +5,10 @@
 (require racket/match
          racket/local
          syntax/parse/define
-         lens/base/main
+         lens/private/base/main
          )
 (module+ test
-  (require rackunit lens/test-util/test-lens))
+  (require rackunit lens/private/test-util/test-lens))
 
 (define-simple-macro (match-lens a:id pat:expr replacement:expr)
   (local [(define (get target)

unstable/lens/match.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Lenses based on match patterns}
 

unstable/lens/set-filterer.rkt

@@ -6,7 +6,7 @@
            (-> predicate/c (lens/c functional-set? functional-set?))]
           ))
 
-(require lens/base/main
+(require lens/private/base/main
          racket/list
          racket/set
          fancy-app

unstable/lens/set-filterer.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Filtering sets}
 

unstable/lens/string-split.rkt

@@ -9,8 +9,8 @@
 
 (require racket/match
          racket/string
-         lens/base/main
+         lens/private/base/main
-         lens/util/immutable
+         lens/private/util/immutable
          )
 (module+ test
   (require rackunit))

unstable/lens/string-split.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Splitting Strings}
 

unstable/lens/struct-nested.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Nested struct lenses}
 

unstable/lens/sublist.rkt

@@ -3,7 +3,7 @@
 (provide sublist-lens)
 
 (require lens
-         lens/list/list-ref-take-drop)
+         lens/private/list/list-ref-take-drop)
 
 (module+ test
   (require rackunit))

unstable/lens/sublist.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Sublist lenses}
 

unstable/lens/syntax.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 
 @title{Syntax Lenses}