Merge pull request #279 from AlexKnauth/multi-package

split into lens-common, lens-data, lens-unstable, and lens-doc packages

.travis.yml

@@ -40,8 +40,8 @@ before_install:
   - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover-coveralls; fi
 
 install:
- - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR
+ - raco pkg install --deps search-auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/
 
 script:
- - raco test $TRAVIS_BUILD_DIR
- - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage .; fi
+ - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens
+ - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage -p lens-common lens-data lens-lib lens-unstable lens-doc lens; fi

info.rkt

@@ -1,41 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-
-(define version "2.0")
-
-
-(define deps
-  '("jack-scribble-example"
-    "base"
-    "rackunit-lib"
-    "unstable-lib"
-    "unstable-list-lib"
-    "unstable-contract-lib"
-    "fancy-app"
-    "syntax-classes-lib"
-    "struct-update-lib"
-    "sweet-exp-lib"
-    "kw-make-struct"
-    "reprovide-lang"
-    "scribble-lib"))
-
-
-(define build-deps
-  '("at-exp-lib"
-    "rackunit-lib"
-    "racket-doc"
-    "jack-scribble-example"
-    "doc-coverage"))
-
-(define cover-omit-paths
-  '(#rx".*\\.scrbl"
-    #rx"main\\.rkt"
-    #rx"info\\.rkt"
-    "lens/private/doc-util"
-    "lens/private/test-util"
-    "lens/private/util"
-    "unstable/lens/struct-provide.rkt"
-    "unstable/lens/syntax.rkt"
-    "unstable/lens/zoom.rkt"))

lens-common/info.rkt

@@ -0,0 +1,26 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "fancy-app"
+    "rackunit-lib"
+    "reprovide-lang"
+    "unstable-contract-lib"
+    "unstable-lib"
+    ))
+
+(define build-deps
+  '("lens-data"
+    "sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    "lens/common.rkt"
+    "lens/private/test-util"
+    "lens/private/util"
+    ))
+

lens-common/lens/common.rkt

@@ -0,0 +1,8 @@
+#lang sweet-exp reprovide
+except-in
+  combine-in
+    lens/private/base/main
+    lens/private/compound/main
+  gen:lens
+  focus-lens
+  use-applicable-lenses!

lens-common/lens/common/applicable.rkt

@@ -0,0 +1,19 @@
+#lang racket/base
+
+(require reprovide/reprovide)
+(reprovide lens/common)
+
+(require (only-in lens/private/base/base use-applicable-lenses!))
+
+(module+ test
+  (require rackunit))
+
+(use-applicable-lenses!)
+
+(module+ test
+  (define (set-car p a)
+    (cons a (cdr p)))
+  (define car-lens (make-lens car set-car))
+  (check-equal? (car-lens '(a b c)) 'a)
+  (check-equal? (lens-view car-lens '(a b c)) 'a)
+  (check-equal? (lens-set car-lens '(a b c) 97) '(97 b c)))

lens-common/lens/private/base/main.rkt

@@ -1,4 +1,4 @@
 #lang reprovide
-"base.rkt"
+lens/private/base/base
 "view-set.rkt"
 "transform.rkt"

lens-common/lens/private/base/transform.rkt

@@ -3,7 +3,7 @@
 (require unstable/sequence
          racket/match
          racket/contract/base
-         "base.rkt"
+         lens/private/base/base
          "../util/list-pair-contract.rkt")
 
 (module+ test

lens-common/lens/private/base/view-set.rkt

@@ -4,7 +4,7 @@
          racket/match
          racket/contract/base
          fancy-app
-         "base.rkt"
+         lens/private/base/base
          "../util/list-pair-contract.rkt")
 
 (module+ test

lens-common/lens/private/compound/arrow.rkt

@@ -7,7 +7,8 @@
          lens-set/thrush
          lens-transform/thrush)
 
-(require lens)
+(require lens/private/base/main
+         lens/private/compound/main)
 
 (module+ test
   (require rackunit racket/list fancy-app))

lens-common/lens/private/compound/thrush.rkt

@@ -8,7 +8,6 @@
 
 (module+ test
   (require rackunit
-           "../list/list-ref-take-drop.rkt"
            "../test-util/test-lens.rkt"))
 
 (provide

lens-common/lens/private/isomorphism/compound.rkt

@@ -14,8 +14,8 @@ require racket/match
 module+ test
   require lens/private/base/main
           lens/private/compound/identity
+          lens/private/isomorphism/data
           rackunit
-          "data.rkt"
 
 (define (isomorphism-compose . args)
   (match args

lens-common/lens/private/test-util/test-lens.rkt

@@ -3,7 +3,7 @@
 (require racket/contract
          rackunit
          fancy-app
-         "../base/base.rkt"
+         lens/private/base/base
          "../base/view-set.rkt")
 
 (provide

lens-data/info.rkt

@@ -0,0 +1,27 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-common"
+    "rackunit-lib"
+    "unstable-lib"
+    "unstable-list-lib"
+    "unstable-contract-lib"
+    "fancy-app"
+    "syntax-classes-lib"
+    "struct-update-lib"
+    "kw-make-struct"
+    "reprovide-lang"
+    ))
+
+(define build-deps
+  '("sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    ))
+

lens-data/lens/private/dict/dict.rkt

@@ -6,7 +6,7 @@
            (-> any/c (lens/c functional-dict? any/c))]
           ))
 
-(require lens/private/util/functional-dict racket/dict fancy-app "../base/main.rkt")
+(require lens/private/base/main lens/private/util/functional-dict racket/dict fancy-app)
 (module+ test
   (require rackunit))
 

lens-data/lens/private/hash/join-hash.rkt

@@ -4,16 +4,16 @@
          racket/match
          unstable/sequence
          fancy-app
-         "../base/main.rkt"
-         "../util/alternating-list.rkt"
+         lens/private/base/main
+         lens/private/util/alternating-list
+         lens/private/util/list-pair-contract
          "../util/immutable.rkt"
-         "../util/list-pair-contract.rkt"
          "../list/join-list.rkt")
 
 (module+ test
   (require rackunit
            "../list/list-ref-take-drop.rkt"
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 (provide
  (contract-out

lens-data/lens/private/hash/nested.rkt

@@ -1,10 +1,10 @@
 #lang racket/base
 
 (require racket/contract/base
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test

lens-data/lens/private/hash/pick.rkt

@@ -2,14 +2,14 @@
 
 (require racket/contract
          racket/list
-         "../base/main.rkt"
+         lens/private/base/main
+         lens/private/util/rest-contract
          "../hash/join-hash.rkt"
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out

lens-data/lens/private/hash/ref.rkt

@@ -2,7 +2,7 @@
 
 (require racket/contract
          fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
          "../util/immutable.rkt")
 
 (module+ test

lens-data/lens/private/isomorphism/data.rkt

@@ -11,7 +11,7 @@ provide string->symbol-lens
 
 require lens/private/base/main
         lens/private/util/alternating-list
-        "base.rkt"
+        lens/private/isomorphism/base
 
 module+ test
   require rackunit

lens-data/lens/private/isomorphism/main.rkt

@@ -0,0 +1,4 @@
+#lang reprovide
+lens/private/isomorphism/base
+lens/private/isomorphism/compound
+"data.rkt"

lens-data/lens/private/list/assoc.rkt

@@ -12,10 +12,10 @@
           ))
 
 (require fancy-app
-         "../base/main.rkt")
+         lens/private/base/main)
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt")
+  (require rackunit lens/private/test-util/test-lens)
   (define assoc-list '((a . 1) (b . 2) (c . 3))))
 
 

lens-data/lens/private/list/cadr-etc.rkt

@@ -2,8 +2,8 @@
 
 (require racket/contract
          syntax/parse/define
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
          "car-cdr.rkt"
          (for-syntax racket/base
                      racket/syntax))

lens-data/lens/private/list/car-cdr.rkt

@@ -5,11 +5,11 @@
  (contract-out [car-lens (lens/c pair? any/c)]
                [cdr-lens (lens/c pair? any/c)]))
 
-(require "../base/main.rkt")
+(require lens/private/base/main)
 
 (module+ test
   (require rackunit
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 
 (define (set-car pair v)

lens-data/lens/private/list/join-list.rkt

@@ -2,14 +2,14 @@
 
 require racket/list
         racket/contract
-        "../base/main.rkt"
-        "../util/alternating-list.rkt"
-        "../util/rest-contract.rkt"
+        lens/private/base/main
+        lens/private/util/alternating-list
+        lens/private/util/rest-contract
 
 module+ test
   require rackunit
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
+          lens/private/test-util/test-lens
 
 provide
   contract-out

lens-data/lens/private/list/list-ref-take-drop.rkt

@@ -26,12 +26,12 @@
 (require racket/list
          fancy-app
          "../util/improper-list-length.rkt"
-         "../base/main.rkt"
-         "../compound/compose.rkt"
+         lens/private/base/main
+         lens/private/compound/compose
          "car-cdr.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 
 (define (set-take n lst new-head)

lens-data/lens/private/list/multi.rkt

@@ -1,14 +1,14 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
-         "../util/rest-contract.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "join-list.rkt"
          "list-ref-take-drop.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out

lens-data/lens/private/main.rkt

@@ -0,0 +1,8 @@
+#lang sweet-exp reprovide
+"dict/dict.rkt"
+"hash/main.rkt"
+"list/main.rkt"
+"stream/stream.rkt"
+"string/main.rkt"
+"struct/main.rkt"
+"vector/main.rkt"

lens-data/lens/private/stream/stream.rkt

@@ -10,12 +10,12 @@ provide
 
 require racket/stream
         fancy-app
-        "../base/main.rkt"
-        "../compound/main.rkt"
+        lens/private/base/main
+        lens/private/compound/main
 
 module+ test
   require rackunit
-          "../test-util/test-lens.rkt"
+          lens/private/test-util/test-lens
 
 
 module+ test

lens-data/lens/private/string/join-string.rkt

@@ -1,17 +1,17 @@
 #lang sweet-exp racket/base
 
 require racket/contract
+        lens/private/base/main
         lens/private/isomorphism/base
-        "../base/main.rkt"
+        lens/private/compound/compose
+        lens/private/util/rest-contract
         "../util/immutable.rkt"
-        "../util/rest-contract.rkt"
-        "../compound/compose.rkt"
         "../list/join-list.rkt"
 
 module+ test
   require rackunit
+          lens/private/test-util/test-lens
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
 
 provide
   contract-out

lens-data/lens/private/string/string.rkt

@@ -11,13 +11,13 @@
           ))
 
 (require fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
          "../util/immutable.rkt"
-         "../string/join-string.rkt"
-         "../compound/main.rkt")
+         "../string/join-string.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 
 (define (string-ref-lens i)

lens-data/lens/private/struct/field.rkt

@@ -3,7 +3,7 @@
 (require racket/local
          syntax/parse/define
          struct-update
-         "../base/main.rkt"
+         lens/private/base/main
          (for-syntax racket/base
                      syntax/parse
                      racket/syntax))

lens-data/lens/private/struct/struct.rkt

@@ -3,7 +3,7 @@
 (require syntax/parse/define
          struct-update
          racket/provide-syntax
-         "../base/main.rkt"
+         lens/private/base/main
          (for-syntax racket/base
                      syntax/parse
                      syntax/parse/class/struct-id
@@ -13,7 +13,7 @@
 (module+ test
   (require rackunit
            fancy-app
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 (provide define-struct-lenses
          struct/lens

lens-data/lens/private/vector/join-vector.rkt

@@ -1,17 +1,17 @@
 #lang sweet-exp racket/base
 
 require racket/contract
+        lens/private/base/main
         lens/private/isomorphism/base
-        "../base/main.rkt"
+        lens/private/compound/compose
+        lens/private/util/rest-contract
         "../util/immutable.rkt"
-        "../util/rest-contract.rkt"
-        "../compound/compose.rkt"
         "../list/join-list.rkt"
 
 module+ test
   require rackunit
+          lens/private/test-util/test-lens
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
 
 provide
   contract-out

lens-data/lens/private/vector/nested.rkt

@@ -1,10 +1,10 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test

lens-data/lens/private/vector/pick.rkt

@@ -1,15 +1,15 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "../vector/join-vector.rkt"
          "ref.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out

lens-data/lens/private/vector/ref.rkt

@@ -2,11 +2,11 @@
 
 (require racket/contract
          fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
          "../util/immutable.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out

lens-doc/info.rkt

@@ -0,0 +1,26 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-lib"
+    "lens-unstable"
+    "scribble-lib"
+    "reprovide-lang"
+    "jack-scribble-example"
+    ))
+
+(define build-deps
+  '("at-exp-lib"
+    "doc-coverage"
+    "racket-doc"
+    "sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx".*\\.scrbl"
+    #rx"info\\.rkt"
+    "lens/private/doc-util"
+    ))
+

lens-doc/lens/applicable.scrbl

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

lens-doc/lens/info.rkt

@@ -0,0 +1,4 @@
+#lang info
+
+(define scribblings '(["main.scrbl" (multi-page) (library) "lens"]))
+

lens-doc/lens/main.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "private/doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:style '(toc)]{Lenses}
 

lens-doc/lens/private/base/base.scrbl

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

lens-doc/lens/private/base/contract.scrbl

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

lens-doc/lens/private/base/laws.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "laws"]{Lens Laws}
 

lens-doc/lens/private/base/transform.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title{Transforming Values With Lenses}

lens-doc/lens/private/base/view-set.scrbl

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

lens-doc/lens/private/compound/compose.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-compose [lens lens?] ...) lens?]{

lens-doc/lens/private/compound/main.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/scribble-include-no-subsection)
 
 @title[#:tag "composing-lenses"]{Joining and Composing Lenses}
 

lens-doc/lens/private/compound/thrush.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-thrush [lens lens?] ...) lens?]{

lens-doc/lens/private/dict/dict.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title[#:tag "dict-reference"]{Dict lenses}

lens-doc/lens/private/doc-util/deflenses.rkt

@@ -1,7 +1,7 @@
 #lang racket
 
 (require scribble/manual
-         (for-label lens))
+         (for-label lens/private/base/main))
 
 (provide deflens
          deflenses)