From 88859d5e7890fb2f210c0b2bbc52a4af9d2c4105 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 5 Jul 2013 14:02:34 -0500 Subject: [PATCH] splitting up redex into multiple pkgs: - cleaning up info.rkt files - adjusting relative requires Also: removed dependency on compatibility-lib (from redex-lib) --- pkgs/redex-pkgs/redex-doc/info.rkt | 7 +++++++ pkgs/redex-pkgs/redex-examples/info.rkt | 11 +++++++++++ pkgs/redex-pkgs/redex-lib/info.rkt | 11 +++++++++++ pkgs/redex-pkgs/redex-lib/redex/info.rkt | 17 +---------------- .../redex/private/reduction-semantics.rkt | 7 ++++--- .../redex/private/rewrite-side-conditions.rkt | 7 +++---- pkgs/redex-pkgs/redex-test/info.rkt | 14 ++++++++++++++ .../redex-test/redex/tests/bitmap-test-util.rkt | 4 ++-- .../redex-test/redex/tests/bitmap-test.rkt | 2 +- .../redex-test/redex/tests/color-test.rkt | 4 ++-- .../redex/tests/compiler/matrix-tests.rkt | 4 ++-- .../redex/tests/compiler/redex-tests.rkt | 10 +++++----- .../redex-test/redex/tests/core-layout-test.rkt | 4 ++-- .../redex/tests/defined-checks-test.rkt | 4 ++-- .../redex-test/redex/tests/gen-test.rkt | 8 ++++---- .../redex/tests/keyword-macros-test.rkt | 2 +- .../redex-test/redex/tests/lw-test-util.rkt | 2 +- .../redex-test/redex/tests/lw-test.rkt | 4 ++-- .../redex-test/redex/tests/matcher-test.rkt | 4 ++-- .../redex-test/redex/tests/pict-test.rkt | 4 ++-- .../redex/tests/rewrite-side-condition-test.rkt | 4 ++-- .../redex-test/redex/tests/rg-test.rkt | 16 ++++++++-------- .../redex-test/redex/tests/stepper-test.rkt | 6 +++--- .../redex-test/redex/tests/term-test.rkt | 6 +++--- .../redex-test/redex/tests/test-util.rkt | 4 ++-- .../redex-test/redex/tests/tl-test.rkt | 8 ++++---- .../redex-test/redex/tests/tut-subst-test.rkt | 2 +- .../redex-test/redex/tests/unify-tests.rkt | 8 ++++---- pkgs/redex-pkgs/redex/info.rkt | 6 ++++++ 29 files changed, 112 insertions(+), 78 deletions(-) create mode 100644 pkgs/redex-pkgs/redex-doc/info.rkt create mode 100644 pkgs/redex-pkgs/redex-examples/info.rkt create mode 100644 pkgs/redex-pkgs/redex-lib/info.rkt create mode 100644 pkgs/redex-pkgs/redex-test/info.rkt create mode 100644 pkgs/redex-pkgs/redex/info.rkt diff --git a/pkgs/redex-pkgs/redex-doc/info.rkt b/pkgs/redex-pkgs/redex-doc/info.rkt new file mode 100644 index 0000000000..adec641e73 --- /dev/null +++ b/pkgs/redex-pkgs/redex-doc/info.rkt @@ -0,0 +1,7 @@ +#lang info + +(define collection 'multi) + +(define deps '("base" "racket-doc")) +(define build-deps '("at-exp-lib" + "scribble-lib")) diff --git a/pkgs/redex-pkgs/redex-examples/info.rkt b/pkgs/redex-pkgs/redex-examples/info.rkt new file mode 100644 index 0000000000..115f87eb96 --- /dev/null +++ b/pkgs/redex-pkgs/redex-examples/info.rkt @@ -0,0 +1,11 @@ +#lang info + +(define collection 'multi) + +(define deps '("base" + "compiler-lib" + "rackunit-lib" + "redex-lib" + "slideshow-lib")) +(define build-deps '("at-exp-lib" + "scribble-lib")) diff --git a/pkgs/redex-pkgs/redex-lib/info.rkt b/pkgs/redex-pkgs/redex-lib/info.rkt new file mode 100644 index 0000000000..266b1403a0 --- /dev/null +++ b/pkgs/redex-pkgs/redex-lib/info.rkt @@ -0,0 +1,11 @@ +#lang info + +(define collection 'multi) + +(define deps '("base" + "draw-lib" + "gui-lib" + "data-lib" + "profile-lib" + "pict-lib")) +(define build-deps '("rackunit-lib")) diff --git a/pkgs/redex-pkgs/redex-lib/redex/info.rkt b/pkgs/redex-pkgs/redex-lib/redex/info.rkt index be78dad4c3..db69d523a0 100644 --- a/pkgs/redex-pkgs/redex-lib/redex/info.rkt +++ b/pkgs/redex-pkgs/redex-lib/redex/info.rkt @@ -6,19 +6,4 @@ (define scribblings (list (list "redex.scrbl" (list 'multi-page) (list 'tool)))) (define release-notes (list (list "Redex" "HISTORY.txt"))) -(define compile-omit-paths '("tests")) -(define deps '("profile-lib" - "rackunit-lib" - "slideshow-lib" - "base" - "compiler-lib" - "compatibility-lib" - "data-lib" - "draw-lib" - "gui-lib" - "pict-lib")) -(define build-deps '("at-exp-lib" - "htdp" - "racket-doc" - "rackunit-lib" - "scribble-lib")) + diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt index cb40cb516d..fc6a959a98 100644 --- a/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt +++ b/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt @@ -17,7 +17,6 @@ racket/list racket/set data/union-find - mzlib/etc (rename-in racket/match (match match:))) (require (for-syntax syntax/name @@ -291,7 +290,7 @@ [(form-name pat ...) (raise-syntax-error #f "expected a judgment form name" stx #'form-name)])) -(define-syntax-set (do-reduction-relation) +(define-syntax (do-reduction-relation stx) (define (do-reduction-relation/proc stx) (syntax-case stx () [(_ orig-stx id orig-reduction-relation allow-zero-rules? lang . w/domain-args) @@ -900,7 +899,9 @@ [(null? stxs) '()] [else (cons (format " ~s" (syntax->datum (car stxs))) - (loop (cdr stxs)))]))))) + (loop (cdr stxs)))])))) + + (do-reduction-relation/proc stx)) (define (build-rewrite-proc/leaf side-conditions-rewritten build-really-matched diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt index 4e73f23296..daea9a5b50 100644 --- a/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt +++ b/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt @@ -1,12 +1,11 @@ #lang racket/base - (require mzlib/list - "underscore-allowed.rkt") - (require "term.rkt" + (require "underscore-allowed.rkt" + "term.rkt" "term-fn.rkt" setup/path-to-relative (for-template - mzscheme + racket/base "term.rkt" "matcher.rkt")) diff --git a/pkgs/redex-pkgs/redex-test/info.rkt b/pkgs/redex-pkgs/redex-test/info.rkt new file mode 100644 index 0000000000..e09d588571 --- /dev/null +++ b/pkgs/redex-pkgs/redex-test/info.rkt @@ -0,0 +1,14 @@ +#lang info + +(define collection 'multi) + +(define deps '("base" + "rackunit-lib" + "at-exp-lib" + "compatibility-lib" + "drracket" + "gui-lib" + "pict-lib" + "redex-lib" + "scribble-lib")) +(define build-deps '()) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt index 9c3c6ee04a..4e49e982ba 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt @@ -6,8 +6,8 @@ (for-syntax racket/base) racket/class racket/promise - "../pict.rkt" - "../reduction-semantics.rkt") + redex/pict + redex/reduction-semantics) (provide btest done show-bitmap-test-gui?) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt index 3826e5bdb5..aef3d173b8 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt @@ -1,6 +1,6 @@ #lang racket (require "bitmap-test-util.rkt" - "../main.rkt" + redex/pict redex/reduction-semantics pict) ;; tests: diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt index a4243924b8..9918d883b2 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt @@ -10,8 +10,8 @@ In the other window, you expect to see the currently unreducted terms in green a |# -(require "../reduction-semantics.rkt" - "../gui.rkt" +(require redex/reduction-semantics + redex/gui racket/gui/base racket/class) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt index 602159da87..cd0406fa70 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt @@ -1,8 +1,8 @@ #lang racket (require redex) (require racket/set) -(require "../../private/compiler/match.rkt") -(require "../../private/compiler/redextomatrix.rkt") +(require redex/private/compiler/match + redex/private/compiler/redextomatrix) (define the-hole (term hole)) (define no-context #f) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt index f039a525ff..c32548d6b6 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt @@ -1,11 +1,11 @@ #lang racket -(require (only-in redex term)) -(require "../../private/lang-struct.rkt" - "../../private/matcher.rkt" +(require (only-in redex term) + redex/private/lang-struct + redex/private/matcher + redex/private/compiler/match + redex/private/compiler/redextomatrix (only-in "../test-util.rkt" equal/bindings?) mzlib/list) -(require "../../private/compiler/match.rkt") -(require "../../private/compiler/redextomatrix.rkt") (define (make-test-mtch a b c) (make-mtch a (build-flat-context b) c)) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt index 18762fd62a..87319b4e3a 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require "../private/core-layout.rkt" - "../private/loc-wrapper.rkt" +(require redex/private/core-layout + redex/private/loc-wrapper "lw-test-util.rkt" "test-util.rkt") diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt index b077a6520f..29191fc20a 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt @@ -1,8 +1,8 @@ #lang racket (require "test-util.rkt" - "../private/error.rkt" - "../private/defined-checks.rkt") + redex/private/error + redex/private/defined-checks) (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt index 6dfb5e8ea8..3df91e29bb 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt @@ -1,10 +1,10 @@ #lang racket -(require "../reduction-semantics.rkt" - "../private/jdg-gen.rkt" - "../private/generate-term.rkt" +(require redex/reduction-semantics + redex/private/jdg-gen + redex/private/generate-term "test-util.rkt" - (only-in "../private/pat-unify.rkt" + (only-in redex/private/pat-unify bound lvar)) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt index 67f72435de..d92b82a035 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt @@ -1,6 +1,6 @@ #lang scheme -(require "../private/keyword-macros.rkt" +(require redex/private/keyword-macros "test-util.rkt") (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt index 350ddf5e72..c6d2251e10 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt @@ -1,5 +1,5 @@ (module lw-test-util mzscheme - (require "../private/loc-wrapper.rkt") + (require redex/private/loc-wrapper) (provide normalize-lw) (define (normalize-lw lw) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt index bb34a3f82b..e089c3dcc2 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt @@ -51,9 +51,9 @@ (module lw-test racket/base (require "test-util.rkt" - "../private/loc-wrapper.rkt" + redex/private/loc-wrapper "lw-test-util.rkt" - (only-in "../pict.rkt" to-lw/stx)) + (only-in redex/pict to-lw/stx)) (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt index 6553a1808f..eb9d8d9308 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require "../private/matcher.rkt" - "../private/lang-struct.rkt" +(require redex/private/matcher + redex/private/lang-struct (only-in "test-util.rkt" equal/bindings?) (for-syntax racket/base) racket/list) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt index b575d8a569..ea24da6e98 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt @@ -5,8 +5,8 @@ ;; for testing functions that aren't easily extraced ;; from the pict.rkt library - (require "../reduction-semantics.rkt" - "../pict.rkt") + (require redex/reduction-semantics + redex/pict) (require texpict/mrpict mred/mred mzlib/class) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt index 5c549bc8e8..6709b89c03 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require (for-syntax "../private/rewrite-side-conditions.rkt" +(require (for-syntax redex/private/rewrite-side-conditions racket/base) - "../private/term.rkt" ;; to get bindings for 'in-hole' etc + redex/private/term ;; to get bindings for 'in-hole' etc rackunit) (define-syntax (rsc stx) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt index 2a57791e9a..ec96ab803f 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt @@ -1,14 +1,14 @@ #lang racket (require "test-util.rkt" - "../private/reduction-semantics.rkt" - "../private/judgment-form.rkt" - "../private/matcher.rkt" - "../private/term.rkt" - "../private/rg.rkt" - "../private/generate-term.rkt" - "../private/keyword-macros.rkt" - "../private/error.rkt") + redex/private/reduction-semantics + redex/private/judgment-form + redex/private/matcher + redex/private/term + redex/private/rg + redex/private/generate-term + redex/private/keyword-macros + redex/private/error) (define-namespace-anchor nsa) (define ns (namespace-anchor->namespace nsa)) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt index 53f9ab5a84..493e05722f 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt @@ -3,9 +3,9 @@ (require framework racket/class "test-util.rkt" - "../reduction-semantics.rkt" - "../private/stepper.rkt" - "../private/size-snip.rkt") + redex/reduction-semantics + redex/private/stepper + redex/private/size-snip) (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt index 323f655ce9..594c86e285 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt @@ -1,7 +1,7 @@ (module term-test scheme - (require "../private/term.rkt" - "../private/lang-struct.rkt" - "../private/matcher.rkt" + (require redex/private/term + redex/private/lang-struct + redex/private/matcher "test-util.rkt") (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt index 41ae3d4d84..a3fd737edc 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt @@ -1,7 +1,7 @@ #lang scheme -(require "../private/matcher.rkt" - "../private/lang-struct.rkt" +(require redex/private/matcher + redex/private/lang-struct (for-syntax syntax/parse setup/path-to-relative) setup/path-to-relative racket/runtime-path) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt index d7092af851..325ecbc487 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt @@ -1,10 +1,10 @@ #lang racket - (require "../reduction-semantics.rkt" - "test-util.rkt" - (only-in "../private/matcher.rkt" make-bindings make-bind) + (require "test-util.rkt" + redex/reduction-semantics + (only-in redex/private/matcher make-bindings make-bind) racket/match racket/trace - "../private/struct.rkt") + redex/private/struct) (reset-count) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt index e0fb43d6dd..c116027cb8 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt @@ -1,6 +1,6 @@ #lang racket/base (require redex/reduction-semantics - "../tut-subst.rkt" + redex/tut-subst racket/set) (define (an-x? x) (memq x '(a b c x y z z2 z2 q))) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt index 6b75815802..1c8b1b0e9e 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt @@ -1,9 +1,9 @@ #lang racket -(require (for-syntax "../private/rewrite-side-conditions.rkt") - "../private/pat-unify.rkt" - "../reduction-semantics.rkt" - "../private/jdg-gen.rkt" +(require (for-syntax redex/private/rewrite-side-conditions) + redex/private/pat-unify + redex/reduction-semantics + redex/private/jdg-gen rackunit) (provide env-equal?) diff --git a/pkgs/redex-pkgs/redex/info.rkt b/pkgs/redex-pkgs/redex/info.rkt new file mode 100644 index 0000000000..32ab9c483d --- /dev/null +++ b/pkgs/redex-pkgs/redex/info.rkt @@ -0,0 +1,6 @@ +#lang setup/infotab + +(define collection 'multi) + +(define deps '("redex-doc" "redex-examples" "redex-lib" "redex-test")) +(define implies '("redex-doc" "redex-examples" "redex-lib" "redex-test"))