From 90bd44a6228043e677ca287fb91829fbd7cba4c4 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 18 Nov 2014 13:38:35 -0500 Subject: [PATCH] Shrinking dependencies and moving enumerate tests --- .../data-doc/data/scribblings/enumerate.scrbl | 7 +++++-- pkgs/data-pkgs/data-doc/info.rkt | 3 ++- pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt | 11 +++++++++++ .../data/enumerate.rkt | 4 +--- pkgs/data-pkgs/data-enumerate-lib/info.rkt | 8 ++++++++ pkgs/data-pkgs/data-lib/info.rkt | 2 +- pkgs/data-pkgs/data-test/info.rkt | 3 ++- .../data-test/tests/data/enumerate.rkt} | 12 +++++------- pkgs/data-pkgs/data/info.rkt | 4 ++-- pkgs/redex-pkgs/redex-lib/info.rkt | 3 ++- pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt | 1 - 11 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt rename pkgs/data-pkgs/{data-lib => data-enumerate-lib}/data/enumerate.rkt (99%) create mode 100644 pkgs/data-pkgs/data-enumerate-lib/info.rkt rename pkgs/{redex-pkgs/redex-test/redex/tests/enumerator-test.rkt => data-pkgs/data-test/tests/data/enumerate.rkt} (98%) diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl index 6e1ad3b62c..7b181fbf7e 100644 --- a/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl +++ b/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl @@ -563,8 +563,11 @@ An @tech{enumeration} raises @racket[e] if @racket[decode] or @racket[encode] is called with on. @examples[#:eval the-eval -(approximate (fail/e (exn:fail "Don't do that!" (current-continuation-marks))) - 5) +(approximate + (fail/e + (exn:fail "Don't do that!" + (current-continuation-marks))) + 5) ]} @defthing[char/e enum?]{ diff --git a/pkgs/data-pkgs/data-doc/info.rkt b/pkgs/data-pkgs/data-doc/info.rkt index 1089f42ce2..020f182149 100644 --- a/pkgs/data-pkgs/data-doc/info.rkt +++ b/pkgs/data-pkgs/data-doc/info.rkt @@ -8,6 +8,7 @@ (define pkg-authors '(ryanc)) (define build-deps '("data-lib" + "data-enumerate-lib" "racket-doc" "scribble-lib")) -(define update-implies '("data-lib")) +(define update-implies '("data-lib" "data-enumerate-lib")) diff --git a/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt b/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt new file mode 100644 index 0000000000..2d816133d9 --- /dev/null +++ b/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt @@ -0,0 +1,11 @@ +data-lib +Copyright (c) 2010-2014 PLT Design Inc. + +This package is distributed under the GNU Lesser General Public +License (LGPL). This means that you can link Racket into proprietary +applications, provided you follow the rules stated in the LGPL. You +can also modify this package; if you distribute a modified version, +you must distribute it under the terms of the LGPL, which in +particular means that you must release the source code for the +modified software. See http://www.gnu.org/copyleft/lesser.html +for more information. diff --git a/pkgs/data-pkgs/data-lib/data/enumerate.rkt b/pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt similarity index 99% rename from pkgs/data-pkgs/data-lib/data/enumerate.rkt rename to pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt index 72b6bf8cc6..fdd8b047eb 100644 --- a/pkgs/data-pkgs/data-lib/data/enumerate.rkt +++ b/pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt @@ -1564,11 +1564,9 @@ t t))) -(module+ - test +(module+ test (require rackunit) (provide check-bijection? - int/e find-size list->inc-set inc-set->list) diff --git a/pkgs/data-pkgs/data-enumerate-lib/info.rkt b/pkgs/data-pkgs/data-enumerate-lib/info.rkt new file mode 100644 index 0000000000..f74fb91f72 --- /dev/null +++ b/pkgs/data-pkgs/data-enumerate-lib/info.rkt @@ -0,0 +1,8 @@ +#lang info +(define collection 'multi) +(define deps '("base" "data-lib" "math-lib")) +(define build-deps '("rackunit-lib")) + +(define pkg-desc "implementation (no documentation) of \"data/enumerate\"") + +(define pkg-authors '(maxsnew jay)) diff --git a/pkgs/data-pkgs/data-lib/info.rkt b/pkgs/data-pkgs/data-lib/info.rkt index 7c71e6c442..0e7419e678 100644 --- a/pkgs/data-pkgs/data-lib/info.rkt +++ b/pkgs/data-pkgs/data-lib/info.rkt @@ -1,6 +1,6 @@ #lang info (define collection 'multi) -(define deps '("base" "math-lib")) +(define deps '("base")) (define build-deps '("rackunit-lib")) (define pkg-desc "implementation (no documentation) part of \"data\"") diff --git a/pkgs/data-pkgs/data-test/info.rkt b/pkgs/data-pkgs/data-test/info.rkt index ced28c4323..c02cc9b9a7 100644 --- a/pkgs/data-pkgs/data-test/info.rkt +++ b/pkgs/data-pkgs/data-test/info.rkt @@ -7,7 +7,8 @@ (define pkg-desc "tests for \"data-lib\"") (define pkg-authors '(ryanc)) -(define build-deps '("racket-index" +(define build-deps '("data-enumerate-lib" + "racket-index" "data-lib" "rackunit-lib")) (define update-implies '("data-lib")) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt b/pkgs/data-pkgs/data-test/tests/data/enumerate.rkt similarity index 98% rename from pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt rename to pkgs/data-pkgs/data-test/tests/data/enumerate.rkt index fe7da32160..94f0b4d5a3 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt +++ b/pkgs/data-pkgs/data-test/tests/data/enumerate.rkt @@ -1,9 +1,10 @@ -#lang racket - +#lang racket/base (require rackunit + racket/function + racket/set data/gvector - redex/private/enumerator - (submod redex/private/enumerator test)) + data/enumerate + (submod data/enumerate test)) ;; const/e tests (let ([e (const/e 17)]) @@ -284,9 +285,6 @@ (check-equal? (list->inc-set '(2 0 1 2)) '(2 3 5 8)) (check-equal? (inc-set->list '(2 3 5 8)) '(2 0 1 2))) -(define (below/e n) - (take/e nat/e n)) - ;; multi-arg map/e test (define sums/e (map/e diff --git a/pkgs/data-pkgs/data/info.rkt b/pkgs/data-pkgs/data/info.rkt index d465477ce7..8ff065ebb0 100644 --- a/pkgs/data-pkgs/data/info.rkt +++ b/pkgs/data-pkgs/data/info.rkt @@ -2,8 +2,8 @@ (define collection 'multi) -(define deps '("data-lib" "data-doc")) -(define implies '("data-lib" "data-doc")) +(define deps '("data-lib" "data-enumerate-lib" "data-doc")) +(define implies '("data-lib" "data-enumerate-lib" "data-doc")) (define pkg-desc "Data strucutures") diff --git a/pkgs/redex-pkgs/redex-lib/info.rkt b/pkgs/redex-pkgs/redex-lib/info.rkt index ec0f331e2d..e8c3ef1812 100644 --- a/pkgs/redex-pkgs/redex-lib/info.rkt +++ b/pkgs/redex-pkgs/redex-lib/info.rkt @@ -4,7 +4,8 @@ (define collection 'multi) -(define deps '("scheme-lib" +(define deps '("data-enumerate-lib" + "scheme-lib" "base" "data-lib" "math-lib" diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt index b964573572..407f0a2a0f 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt @@ -36,7 +36,6 @@ "check-syntax-test.rkt" "test-docs-complete.rkt" "tut-subst-test.rkt" - "enumerator-test.rkt" "enum-test.rkt" "bitmap-test.rkt") (if test-examples?