diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index ac8a793567..0c68658fce 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -29,7 +29,7 @@ ;; except the arrow contracts ;; -(require (except-in scheme/private/contract +(require (except-in scheme/private/contract-base define/contract with-contract define-struct/contract) @@ -43,7 +43,7 @@ (except-out (all-from-out scheme/private/contract-ds) lazy-depth-to-look) - (except-out (all-from-out scheme/private/contract) + (except-out (all-from-out scheme/private/contract-base) check-between/c string-len/c check-unary-between/c) diff --git a/collects/scheme/contract.ss b/collects/scheme/contract.ss index 3db9925075..980fb8fb7c 100644 --- a/collects/scheme/contract.ss +++ b/collects/scheme/contract.ss @@ -9,7 +9,7 @@ differences from v3: |# -(require "private/contract.ss" +(require "private/contract-base.ss" "private/contract-arrow.ss" "private/contract-guts.ss" "private/contract-ds.ss" @@ -26,7 +26,7 @@ differences from v3: procedure-accepts-and-more? check-procedure check-procedure/more) - (except-out (all-from-out "private/contract.ss") + (except-out (all-from-out "private/contract-base.ss") ∃? check-between/c check-unary-between/c)) diff --git a/collects/scheme/exists/lang.ss b/collects/scheme/exists/lang.ss index 5867514509..fa1f3c246c 100644 --- a/collects/scheme/exists/lang.ss +++ b/collects/scheme/exists/lang.ss @@ -1,6 +1,6 @@ #lang scheme -(require "../private/contract.ss") +(require "../private/contract-base.ss") ;; this code builds the list of predicates (in case it changes, this may need to be re-run) #; diff --git a/collects/scheme/private/contract.ss b/collects/scheme/private/contract-base.ss similarity index 99% rename from collects/scheme/private/contract.ss rename to collects/scheme/private/contract-base.ss index d7012260fd..e2f8d59593 100644 --- a/collects/scheme/private/contract.ss +++ b/collects/scheme/private/contract-base.ss @@ -1213,7 +1213,7 @@ improve method arity mismatch contract violation error messages? (let ([m (regexp-match #rx"^make-(.*)$" (format "~a" (syntax-e stx)))]) (cond [m (cadr m)] - [else (raise-syntax-error 'contract.ss + [else (raise-syntax-error 'contract-base.ss "unable to cope with a struct maker whose name doesn't begin with `make-'" orig-stx)])))) diff --git a/collects/scheme/private/contract-basic-opters.ss b/collects/scheme/private/contract-basic-opters.ss index c1ec140761..a8947d4279 100644 --- a/collects/scheme/private/contract-basic-opters.ss +++ b/collects/scheme/private/contract-basic-opters.ss @@ -2,7 +2,7 @@ (require "contract-guts.ss" "contract-opt.ss" - "contract.ss") + "contract-base.ss") (require (for-syntax scheme/base "contract-opt-guts.ss")) diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index f1c444aee7..140ce31019 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -18,7 +18,7 @@ another. Programmers specify the behavior of a module exports via constraints. @note-lib[scheme/contract #:use-sources (scheme/private/contract-ds - scheme/private/contract + scheme/private/contract-base scheme/private/contract-guts)] @deftech{Contracts} come in two forms: those constructed by the diff --git a/collects/tests/macro-debugger/tests/collects.ss b/collects/tests/macro-debugger/tests/collects.ss index ded1b6a41f..b28cd70ca2 100644 --- a/collects/tests/macro-debugger/tests/collects.ss +++ b/collects/tests/macro-debugger/tests/collects.ss @@ -195,7 +195,7 @@ scheme/mzscheme scheme/nest scheme/private/class-internal - scheme/private/contract + scheme/private/contract-base scheme/private/contract-arrow scheme/private/contract-basic-opters scheme/private/contract-ds