splitting up redex into multiple pkgs:

- cleaning up info.rkt files
- adjusting relative requires

Also: removed dependency on compatibility-lib (from redex-lib)
This commit is contained in:
Robby Findler 2013-07-05 14:02:34 -05:00
parent 422e0f7fb6
commit 88859d5e78
29 changed files with 112 additions and 78 deletions

View File

@ -0,0 +1,7 @@
#lang info
(define collection 'multi)
(define deps '("base" "racket-doc"))
(define build-deps '("at-exp-lib"
"scribble-lib"))

View File

@ -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"))

View File

@ -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"))

View File

@ -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"))

View File

@ -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

View File

@ -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"))

View File

@ -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 '())

View File

@ -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?)

View File

@ -1,6 +1,6 @@
#lang racket
(require "bitmap-test-util.rkt"
"../main.rkt"
redex/pict redex/reduction-semantics
pict)
;; tests:

View File

@ -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)

View File

@ -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)

View File

@ -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))

View File

@ -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")

View File

@ -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)

View File

@ -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))

View File

@ -1,6 +1,6 @@
#lang scheme
(require "../private/keyword-macros.rkt"
(require redex/private/keyword-macros
"test-util.rkt")
(reset-count)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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))

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)))

View File

@ -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?)

View File

@ -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"))