From 3ad9a94b4617f333f4b81f773c18d4f5068123ef Mon Sep 17 00:00:00 2001 From: Shu-Yu Guo Date: Sat, 4 Nov 2006 05:02:57 +0000 Subject: [PATCH] - refactored opt/c to its own struct/prop - moved opters next to their respective original contracts where possible - the rest moved to contract-basic-opters.ss to avoid module cycle - fixed some typos svn: r4774 original commit: bd0b34a9ac5b16ac08bc86bf0624f18982575b80 --- collects/mzlib/contract.ss | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index 0dc152e..0bd6a61 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -3,17 +3,27 @@ "private/contract-arrow.ss" "private/contract-guts.ss" "private/contract-ds.ss" + "private/contract-opt-guts.ss" "private/contract-opt.ss" - "private/contract-opters.ss" ;; loaded for its effect -- registering the opters - ) - + "private/contract-basic-opters.ss") (provide - ; (all-from "private/contract-opt.ss") ;; not yet + (all-from "private/contract-opt.ss") + (all-from "private/contract-opt-guts.ss") + (all-from-except "private/contract-opt-guts.ss" + make-opt-contract + orig-ctc-prop + orig-ctc-pred? + orig-ctc-get) (all-from "private/contract-ds.ss") - (all-from "private/contract-arrow.ss") + (all-from-except "private/contract-arrow.ss" + check-procedure) (all-from-except "private/contract-guts.ss" build-compound-type-name first-order-prop - first-order-get) - (all-from "private/contract.ss"))) + first-order-get + check-flat-contract + check-flat-named-contract) + (all-from-except "private/contract.ss" + check-between/c + check-unary-between/c))) \ No newline at end of file